Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity
12,587 Commits 35 Branches 228 Tags
f637a4e4ced20c3ee22fa9d9ec71a54205025c76
Commit Graph

12587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
f637a4e4ce Merged r16485 from trunk to 3.3-stable (#22335, #24271) 
Gemfile: explicitly use rbpdf 1.19.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16486 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 11:04:24 +00:00
Toshi MARUYAMA
9c2c354b46 Merged r16470 from trunk to 3.3-stable (#25349, #25505) 
Russian translation for 3.2-stable updated by Kirill Bezrukov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16471 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-03 16:41:00 +00:00
Toshi MARUYAMA
9ada14099a Russian translation for 3.3-stable updated by Ilya Potapov (#25397, #25502) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-03 14:34:56 +00:00
Toshi MARUYAMA
196a0f17e6 Merged r16438 from trunk to 3.3-stable (#25204, #25458) 
Portuguese translation for 3.2-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16442 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 06:10:35 +00:00
Toshi MARUYAMA
cba14bd6a7 3.3-stable: revert r16439. 
I mistook commit log.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16441 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 06:10:24 +00:00
Toshi MARUYAMA
b1811c5478 Merged r16438 from trunk to 3.3-stable (#25204, #25459) 
Portuguese translation for 3.3-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16439 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 05:50:01 +00:00
Toshi MARUYAMA
b748ebae8e Merged r16434 from trunk to 3.3-stable (#25204, #25459) 
Portuguese translation for 3.3-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 05:20:30 +00:00
Toshi MARUYAMA
2352dad18e Merged r16433 from trunk to 3.3-stable (#25204, #25458) 
Portuguese translation for 3.2-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16435 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 05:20:18 +00:00
Toshi MARUYAMA
648097cefe 3.3-stable: remove test/ui/custom_fields_test_ui.rb (#25455) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-28 14:53:09 +00:00
Toshi MARUYAMA
d373a95c04 Merged r16428 from trunk to 3.3-stable (#25371) 
git: use '--no-renames' option in 'show' command.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-24 16:15:46 +00:00
Toshi MARUYAMA
dbc64d0b8e Merged r16422 from trunk to 3.3-stable (#25371) 
Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-20 18:03:42 +00:00
Jean-Philippe Lang
540237033e Merged r16341 (#25115). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-28 20:00:17 +00:00
Toshi MARUYAMA
ab0fa04b62 Merged r16329 from trunk to 3.3-stable (#24999) 
Mercurial 4.1 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-05 05:53:30 +00:00
Toshi MARUYAMA
b03982e1b7 Merged r16324 from trunk to 3.3-stable. 
Gemfile: pin i18n version 0.7.0.

i18n 0.8.0 causes error.

<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
    lib/redmine/i18n.rb:58:in `ll'
    lib/redmine/i18n.rb:122:in `block in languages_options'
    lib/redmine/i18n.rb:122:in `map'
    lib/redmine/i18n.rb:122:in `languages_options'
    test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-02 07:27:16 +00:00
Jean-Philippe Lang
cca51a8c51 Merged r16293 (#24875). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16307 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:42:54 +00:00
Jean-Philippe Lang
f37d1a5688 Merged r16292 (#20661). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16306 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:41:54 +00:00
Jean-Philippe Lang
4605381086 Merged r16284 (#23803). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:46:08 +00:00
Jean-Philippe Lang
ac7ebdc34a Merged r16283 (#23793). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:44:42 +00:00
Jean-Philippe Lang
e360394be7 Merged r16287 to r16289 (#24416). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:42:50 +00:00
Jean-Philippe Lang
b92d7879ff Merged r16286 (#24307). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:41:25 +00:00
Jean-Philippe Lang
46e11396b8 Merged r16285 (#24199). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:39:34 +00:00
Jean-Philippe Lang
730f1c3071 Merged r16227 (#24869). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:25:29 +00:00
Toshi MARUYAMA
643470664c Merged r16277 from trunk to 3.3-stable (#24949, #24923) 
Bulgarian translation for 3.2-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16278 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-28 14:32:08 +00:00
Toshi MARUYAMA
3c4028d711 Merged r16027 from trunk to 3.3-stable (#24948, #24400) 
Bulgarian translation for 3.3-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16276 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-28 12:59:35 +00:00
Toshi MARUYAMA
24999b203e Merged r16235 from trunk to 3.3-stable (#24751, #24886) 
Japanese translation for 3.2-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-20 14:00:19 +00:00
Toshi MARUYAMA
3c6df7d8aa Merged r16034 from trunk to 3.3-stable (#24512, #24885) 
Japanese translation for 3.3-stable updated by Go MAEDA

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-20 12:14:11 +00:00
Toshi MARUYAMA
7512879c9e Merged r16212 from trunk to 3.3-stable (#24824) 
Traditional Chinese translation for trunk updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16214 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-17 05:25:30 +00:00
Toshi MARUYAMA
cb8aaf1974 Merged r16167 from trunk to 3.3-stable. 
Gemfile: pin nokogiri version 1.6.

nokogiri 1.7.0.1 requires Ruby version >= 2.1.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-09 16:40:13 +00:00
Toshi MARUYAMA
f905ee347b Merged r16157 from trunk to 3.3-stable (#24537, #24778) 
Czech translation for 3.3-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16158 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-08 04:45:50 +00:00
Jean-Philippe Lang
d4dcd3a8dc Merged r16092. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:40:28 +00:00
Jean-Philippe Lang
2551d68c1f Merged r16142 (3.3.2 release). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:37:58 +00:00
Jean-Philippe Lang
4ad24a2250 Merged r16138 (#14658). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 07:51:52 +00:00
Jean-Philippe Lang
01e985eb0a Merged r16134 (#24283). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16135 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:56:22 +00:00
Jean-Philippe Lang
c4b1ab644e Merged r16118 to r16122 (#24693, #24718, #24722). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16132 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:47:29 +00:00
Jean-Philippe Lang
82a67f4ebe Merged r16114 (#24646). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 19:52:47 +00:00
Jean-Philippe Lang
7ec2c27385 Merged r16116 (#22034). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 18:09:00 +00:00
Jean-Philippe Lang
a9b0564c13 Merged r16125. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16126 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 18:00:29 +00:00
Jean-Philippe Lang
5dd1fe1345 Merged r16059, r16060, r16064, r16072. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16106 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 16:02:38 +00:00
Jean-Philippe Lang
21a847d01d Fix test in 3.3-stable (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16104 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 15:48:15 +00:00
Jean-Philippe Lang
f3c5056e39 Merged r16071 (#24595). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16099 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:05:23 +00:00
Jean-Philippe Lang
ac456fafc8 Merged r16056 (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16097 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:02:07 +00:00
Jean-Philippe Lang
d6a06cbf77 Merged r16057 (#13622). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16095 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:01:00 +00:00
Jean-Philippe Lang
d5a943fd13 Merged r16049 (#24156). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16093 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 08:59:43 +00:00
Jean-Philippe Lang
202285ea8b Merged r15996 (#24062). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16048 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:42:45 +00:00
Jean-Philippe Lang
e04ff6feda Merged r15959 (#24311). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:42:06 +00:00
Jean-Philippe Lang
5daca9055f Merged r16045(#24274). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16046 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:41:15 +00:00
Jean-Philippe Lang
4e7de4e447 Merged r15954 (#24000). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16044 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:39:27 +00:00
Jean-Philippe Lang
bde77eebe3 Merged r15952 and r15953 (#23922). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16043 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:38:40 +00:00
Toshi MARUYAMA
9160c401e3 Merged r16015 from trunk to 3.3-stable (#24004) 
Spanish Panama translation for 3.3-stable updated by Helder Manuel Torres Vieira.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16026 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-30 07:44:44 +00:00
Toshi MARUYAMA
e020d26c71 Merged r16014 from trunk to 3.3-stable (#24004) 
Spanish translation for 3.3-stable updated by Helder Manuel Torres Vieira.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-30 07:44:33 +00:00