Jean-Philippe Lang
03629b60b4
Updates for 3.0.4 release.
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14423 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-07 19:43:38 +00:00
Jean-Philippe Lang
9b48fe532c
Merged r14388 ( #19842 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14404 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:34:16 +00:00
Jean-Philippe Lang
a853854498
Merged r14389 ( #20203 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14401 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:30:12 +00:00
Jean-Philippe Lang
c6aba2a672
Merged r14396 ( #17757 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14398 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:23:19 +00:00
Jean-Philippe Lang
d24e6710f4
Merged r14380 ( #20066 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14386 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-28 10:01:00 +00:00
Jean-Philippe Lang
c49b19d92e
Merged r14381.
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14383 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-28 09:19:16 +00:00
Toshi MARUYAMA
0aa7803018
Merged r14370 from trunk to 3.0-stable.
...
Gemfile: update Rails to 4.2.3.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-26 13:40:29 +00:00
Toshi MARUYAMA
cf0bc934a3
Merged r14360 from trunk to 3.0-stable ( #20142 )
...
update Gemfile to require rbpdf ~>1.18.6.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14361 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-21 09:47:36 +00:00
Toshi MARUYAMA
ec0c7dbf26
Merged r14351 from trunk to 3.0-stable ( #19825 )
...
Russian translation update.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-20 04:13:35 +00:00
Toshi MARUYAMA
c39b3ad7c4
Merged r14350 from trunk to 3.0-stable ( #20035 )
...
Italian translation update.
Patch by Daniele Renda.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14355 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-20 04:13:22 +00:00
Toshi MARUYAMA
1ea8b3608e
Merged r14329 from trunk to 3.0-stable ( #19252 )
...
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.
sqlite-jdbc was updated to 3.8.10.1 in upstream.
f7a20b0d57
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14330 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-18 07:13:50 +00:00
Jean-Philippe Lang
94f7119037
Merged r14311 and r14312 from trunk ( #19844 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14326 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-17 18:11:42 +00:00
Toshi MARUYAMA
afc644cd17
Merged r14319 and r14323 from trunk to 3.0-stable
...
* Gemfile: update Rails to 4.2.2
* Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14324 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-17 13:54:29 +00:00
Jean-Philippe Lang
1ced42dd57
Merged r14301 ( #19835 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-13 11:11:10 +00:00
Jean-Philippe Lang
06b7d48dba
Merged r14294 ( #19957 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14306 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-13 11:10:22 +00:00
Jean-Philippe Lang
e4dcb888c5
Merged r14284 ( #19485 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:24:03 +00:00
Jean-Philippe Lang
38ab1da933
Merged r14281 ( #19956 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:19:10 +00:00
Jean-Philippe Lang
842ee8a5e0
Merged r14267 ( #19840 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14279 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:10:28 +00:00
Jean-Philippe Lang
04df8cbbac
Merged r14268 ( #19815 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:06:31 +00:00
Jean-Philippe Lang
f53c19260c
Updates for 3.0.3 release.
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14256 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:59:45 +00:00
Jean-Philippe Lang
e0fc848696
Merged r14243 ( #19793 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:22:59 +00:00
Jean-Philippe Lang
c6e826502a
Merged r14239 and r14240 ( #19706 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:22:19 +00:00
Jean-Philippe Lang
68723c20d2
Merged r14245 ( #19655 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:21:39 +00:00
Jean-Philippe Lang
b8811f47cc
Merged r14237 ( #19735 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:20:27 +00:00
Jean-Philippe Lang
010945b3d8
Merged r14241 ( #19731 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:19:50 +00:00
Jean-Philippe Lang
20f56ce0ae
Merged r14242 ( #18580 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:19:06 +00:00
Toshi MARUYAMA
5f1385e096
Merged r14235 from trunk to 3.0-stable.
...
prevent IssuesControllerTest#test_index_csv_big_5 fails randomly
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-01 16:57:38 +00:00
Toshi MARUYAMA
a971c16a67
Merged r14230 from trunk to 3.0-stable
...
add missing fixtures to test/unit/changeset_test.rb
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14233 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-30 06:20:48 +00:00
Jean-Philippe Lang
436bfd971b
Merged r14223.
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14224 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-26 06:47:45 +00:00
Jean-Philippe Lang
37c8b09eb5
Merged r14221 ( #19570 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 08:30:53 +00:00
Jean-Philippe Lang
8ff0214d45
Merged r14219 ( #19537 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14220 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 08:27:24 +00:00
Jean-Philippe Lang
16516fb48a
Merged r14217 ( #19185 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 08:14:04 +00:00
Jean-Philippe Lang
1c8527b8c1
Merged r14215 ( #19482 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 08:01:07 +00:00
Jean-Philippe Lang
5fced3a703
Merged r14180 ( #19606 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14214 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:49:13 +00:00
Jean-Philippe Lang
4900525756
Merged r14160 ( #19580 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14213 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:46:50 +00:00
Jean-Philippe Lang
1fad29bc14
Merged r14179 ( #19569 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:40:46 +00:00
Jean-Philippe Lang
214e737ee0
Merged r14159 ( #19558 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:39:16 +00:00
Jean-Philippe Lang
4af6d9cc5d
Merged r14158 ( #19553 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:38:31 +00:00
Jean-Philippe Lang
873dff0d36
Merged r14165 and r14166 ( #19544 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:37:46 +00:00
Jean-Philippe Lang
94910b1e09
Merged r14162 ( #19464 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:35:50 +00:00
Jean-Philippe Lang
e2224d4d02
Merged r14155 ( #19405 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:34:25 +00:00
Jean-Philippe Lang
d60a78fe23
Merged r14163 ( #19168 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14204 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:33:28 +00:00
Jean-Philippe Lang
97939f8829
Merges r14151 to r14153 ( #19163 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14203 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:32:42 +00:00
Jean-Philippe Lang
d950d7325f
Merged r14201 ( #13583 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14202 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:23:16 +00:00
Jean-Philippe Lang
737cbcc2e9
Merged r14164 ( #19538 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14199 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:20:44 +00:00
Jean-Philippe Lang
d904292635
Merged r14156 and r14161 ( #19400 ).
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:18:11 +00:00
Toshi MARUYAMA
b12e839672
3.0-stable: copy Spanish wiki helps to Spanish Panama ( #19489 )
...
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14196 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-24 07:34:51 +00:00
Toshi MARUYAMA
a05f04d734
Merged r14193 from trunk to 3.0-stable ( #19489 )
...
Spanish Panama translation added by Leonel Iturralde.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14195 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-24 07:34:36 +00:00
Toshi MARUYAMA
d18edfd913
Merged r14157 from trunk to 3.0-stable ( #19444 ).
...
Typo in wiki_syntax_detailed.html.
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14183 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-19 10:25:36 +00:00
Toshi MARUYAMA
524bd1479b
Merged r14175 from trunk to 3.0-stable ( #19252 )
...
Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.
r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-14 12:53:39 +00:00