Commit Graph

11667 Commits

Author SHA1 Message Date
Jean-Philippe Lang
8935ccf736 Merged r14794 (#21136).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 09:06:32 +00:00
Jean-Philippe Lang
5bd5738750 Merged r14795 and r14796 (#21150).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14838 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 08:56:55 +00:00
Jean-Philippe Lang
32a1a803ab Merged r14812 (#6969).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14835 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-08 08:50:41 +00:00
Toshi MARUYAMA
9acb58133b Merged r14813 from trunk to 3.0-stable (#20591, #20811)
update rbpdf version to 1.18.7.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 11:07:14 +00:00
Jean-Philippe Lang
a483b19a95 Merged r14758 (#21071).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:18:36 +00:00
Jean-Philippe Lang
dd4a20b3a9 Merged r14670 (#20677).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-11-07 08:12:03 +00:00
Toshi MARUYAMA
e4baf04c25 Merged r14761 from trunk to 3.0-stable (#20911, #21105)
Japanese wiki_syntax_detailed_textile.html translation for 3.0-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-29 16:47:47 +00:00
Toshi MARUYAMA
0c42b18134 Merged r14365 only public/help/ja/wiki_syntax_detailed.html to 3.0-stable (#20911, #21105)
Replace tabs with spaces and remove trailing tabs in several files.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-29 16:47:36 +00:00
Toshi MARUYAMA
cec38bb11a Merged r14699 from trunk to 3.0-stable (#20785, #21031)
Polish translation for 3.0-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 12:01:26 +00:00
Toshi MARUYAMA
4a1ffec7e0 Merged r14698 from trunk to 3.0-stable (#20785, #21030)
Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14704 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-20 12:01:16 +00:00
Jean-Philippe Lang
7b4c1f493c Merged r14662 (#20730).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:36:46 +00:00
Jean-Philippe Lang
ec88cf6079 Merged r14658 (#20380).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14660 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:22:18 +00:00
Jean-Philippe Lang
8a338756fd Merged r14654 (#20380).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 07:06:39 +00:00
Jean-Philippe Lang
f25f0e0237 Merged r14618 (#20360).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-10-09 06:42:04 +00:00
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