Commit Graph

11653 Commits

Author SHA1 Message Date
Jean-Philippe Lang
e8a00fd2b4 Merged r14619 (#20282).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 06:37:43 +00:00
Jean-Philippe Lang
65084cb3b7 Updates for 3.0.5 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14605 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-20 06:14:22 +00:00
Toshi MARUYAMA
d6d94a1b25 Merged r14598 from trunk to 3.0-stable (#20761)
fix typo of Japanese translation for notice_gantt_chart_truncated.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-16 10:50:46 +00:00
Toshi MARUYAMA
b6f65f96ae Merged r14587 from trunk to 3.0-stable (#20728, #20746)
Portuguese translation for 3.0-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14594 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 14:22:02 +00:00
Toshi MARUYAMA
45c989e72f Merged r14586 from trunk to 3.0-stable (#20728, #20745)
Portuguese translation for 2.6-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14593 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 14:21:51 +00:00
Toshi MARUYAMA
a0e04a0f6f Merged r14517 from trunk to 3.0-stable (#20452, #20737)
Czech translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14579 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:36:59 +00:00
Toshi MARUYAMA
cf462fdb88 Merged r14572 from 3.1-stable to 3.0-stable (#20452, #20737)
3.1-stable: fix Czech textile ol example.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14578 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:36:47 +00:00
Toshi MARUYAMA
50c6c56915 Merged r14516 from 3.1-stable to 3.0-stable (#20452, #20737)
Czech wiki help translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:36:36 +00:00
Toshi MARUYAMA
c983a37a9a Merged r14365 only public/help/cs/wiki_syntax_detailed.html from trunk to 3.0-stable (#20737, #20140)
Replace tabs with spaces.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:36:24 +00:00
Toshi MARUYAMA
3f240d847a Merged r14513 from trunk to 3.0-stable (#20452, #20737)
Czech translation for 2.6-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:36:13 +00:00
Toshi MARUYAMA
6e89444e43 3.0-stable: revert r14571 (back to Rails 4.2.3)
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14574 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 07:16:29 +00:00
Toshi MARUYAMA
18d4c6fdec Merged r14521 from trunk to 3.0-stable
Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14571 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-14 05:28:34 +00:00
Jean-Philippe Lang
1756ca3909 Merged r14480 (#20735).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14566 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-13 14:51:05 +00:00
Jean-Philippe Lang
9d8f75d281 Merged r14560 and r14561 (#19577).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14563 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-13 14:44:19 +00:00
Jean-Philippe Lang
e7a3b1f093 Merged r14508 (#20512).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-12 12:49:12 +00:00
Jean-Philippe Lang
ae6ff3e104 Merged r14499 (#20454).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-12 10:58:53 +00:00
Jean-Philippe Lang
bcc0e380b3 Merged r14472 (#20427).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-09-12 10:57:22 +00:00
Toshi MARUYAMA
c55438309f Merged r14460 from trunk to 3.0-stable (#20338, #20409)
Turkish translation for 3.0-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-26 14:13:16 +00:00
Toshi MARUYAMA
85fe0bd4f4 Merged r14459 from trunk to 3.0-stable (#20338, #20408)
Turkish translation for 2.6-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14465 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-26 14:13:03 +00:00
Toshi MARUYAMA
d13ac90b5c Merged r14443 from trunk to 3.0-stable (#19172)
doc/INSTALL: update requirements Bundler >= 1.5.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14445 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-13 04:10:57 +00:00
Toshi MARUYAMA
a013b0fa11 Merged r14440 from trunk to 3.0-stable (#20292)
add config/secrets.yml to .gitignore and .hgignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-12 10:47:53 +00:00
Toshi MARUYAMA
ccd40728af Merged r14437 from trunk to 3.0-stable (#20292)
add config/secrets.yml to svn:ignore.

Contributed by Benjamin Petersen.


git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14439 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-12 10:28:56 +00:00
Toshi MARUYAMA
994b2f0bd7 Merged r14429 from trunk to 3.0-stable (#20199, #20295)
Russian translation for 3.0-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14435 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-12 09:53:58 +00:00
Toshi MARUYAMA
fd1fac9458 Merged r14428 from trunk to 3.0-stable (#20199, #20294)
Russian translation for 2.6-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14434 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-12 09:53:47 +00:00
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