17bd53ae43
Merged r11491 from trunk to 2.2-stable ( #13310 )
...
pt-BR "label_last_n_weeks" translation updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11492 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-28 08:33:38 +00:00
559dc4f523
Merged r11432 from trunk to 2.2-stable ( #13207 , #13206 )
...
Portuguese translation for 2.2-stable updated by Rui Rebelo.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 14:19:38 +00:00
6dcd50047d
Merged r11389 from trunk to 2.2-stable.
...
add "tmp:clear" to "ci:setup" rake task for translation.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11435 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 13:22:25 +00:00
252df8dfc0
Merged r11399 from trunk to 2.2-stable ( #13138 )
...
not use htmlentities gem in rfpdf plugin.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-15 14:32:45 +00:00
cbd3b057e0
Merged r11390 from trunk to 2.2-stable.
...
Bulgarian translation of jstoolbar-bg.js updated by Ivan Cenov (#13181 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11391 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-15 06:23:34 +00:00
d094dea0ec
Merged r11366 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 18:08:38 +00:00
3a98a14250
Merged r11350 from trunk ( #13126 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11365 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 18:04:49 +00:00
ecef96a6b9
Merged r11332 from trunk ( #13097 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11364 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 18:03:16 +00:00
0951522247
Merged r11331 and r11333 from trunk ( #13075 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11363 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 18:01:15 +00:00
42cc2d322a
Merged r11281 from trunk ( #12979 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11362 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 17:57:46 +00:00
0367c323de
Merged r11258 from trunk ( #12930 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11361 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 17:56:39 +00:00
80be82ae50
Merged r11353 from trunk to 2.2-stable
...
upgrade Rails to 3.2.12.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11358 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 06:28:11 +00:00
ebed927de5
2.2-stable: svn propset svn:eol-style native SVG source files ( #12971 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11357 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 03:52:41 +00:00
cbd069118a
2.2-stable: backout r11355 (back to Rails 3.2.11)
...
jruby-1.6.7 tests fail on CI server.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 02:49:25 +00:00
a211d1be7d
Merged r11353 from trunk to 2.2-stable
...
upgrade Rails to 3.2.12.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11355 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 01:46:21 +00:00
0a8e0a3bed
Merged r11306 from trunk to 2.2-stable ( #11987 )
...
pdf: fix broken new line in table.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-03 06:53:18 +00:00
58cf34dea5
Merged r11263 from trunk to 2.2-stable ( #12987 )
...
Russian translation for 2.2-stable updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-26 00:40:21 +00:00
594a7bde95
Merged r11246 from trunk to 2.2-stable ( #12926 , #12928 )
...
Bulgarian translation for 2.2-stable updated by Ivan Cenov.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-21 13:54:49 +00:00
c5e257d82b
Merged r11243 from trunk to 2.2-stable ( #12922 )
...
Spanish translation for 2.2-stable updated by Jorge López.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11245 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-21 11:50:27 +00:00
56b12b289f
Merged r11239 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 18:24:43 +00:00
c99eef1aff
Merged r11228 from trunk ( #12851 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 17:09:36 +00:00
ed891e2733
Merged r11227 from trunk ( #9842 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 17:06:46 +00:00
4620b8b8db
Backported r11233 from trunk ( #12833 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11234 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 17:03:40 +00:00
98eb2edd25
Merged r11225 from trunk ( #12838 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11232 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 17:01:03 +00:00
ed7318fb8d
Backported r11157 and r11158 from trunk ( #12801 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 16:59:42 +00:00
5a1a2f5855
Merged r11159 from trunk ( #12799 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 16:56:50 +00:00
f1314278d5
Backported r11196 from trunk ( #7510 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11229 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 16:55:37 +00:00
3a8b872a09
Merged r11170 from trunk to 2.2-stable ( #12818 )
...
Swedish translation updated by Nicklas Holm.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11172 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 12:43:51 +00:00
56290979fc
Merged r11163 from trunk to 2.2-stable ( #12809 )
...
Swedish translation updated by Nicklas Holm.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-11 13:19:18 +00:00
6e0fb415a7
Merged r11160 from trunk to 2.2-stable ( #12800 )
...
Serbian translation updated by Miodrag Milic.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-11 08:31:14 +00:00
f26654b29f
Merged r11146 from trunk: Changes for 2.2.1 release.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:33:24 +00:00
5c62c1cf95
Merged r11126 from trunk ( #12744 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11145 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:31:05 +00:00
2d6adbd7ff
Merged r11088 from trunk ( #12691 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11144 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:29:59 +00:00
b0ccaffe1b
Merged r11064 from trunk ( #12652 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:29:08 +00:00
2c37617973
Merged r11140 from trunk to 2.2-stable.
...
Upgrade to Rails 3.2.11.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-08 23:57:13 +00:00
567eb70fdb
Merged r11128 from trunk to 2.2-stable.
...
Test fails when run at the beginning of the day.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-08 23:14:03 +00:00
de63102925
Merged r11109 from trunk to 2.2-stable
...
Upgrade to Rails 3.2.10.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11111 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-04 02:05:44 +00:00
a8fcf9389e
Merged r11091 from trunk ( #12711 , #11290 )
...
fix incorrect min_x_value of lib/SVG/Graph/TimeSeries.rb by r10439.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11093 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-03 00:15:32 +00:00
3e4b36de83
Merged r11051 from trunk to 2.2-stable ( #12630 )
...
Russian "x_hours" translation updated by Mikhail Velkin.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-19 00:00:04 +00:00
edd584d59e
Merged r11041 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-18 12:24:17 +00:00
e2b27ab696
Merged r11036 from trunk to 2.2-stable ( #12615 , #12619 )
...
Russian translation changed by Kirill Bezrukov.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-18 00:04:49 +00:00
1968d039ee
Merged r11035 from trunk to 2.2-stable ( #12615 )
...
Russian translation updated by Kirill Bezrukov.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-17 23:24:31 +00:00
fddc33cd45
Merged r11022 from trunk to 2.2-stable ( #12614 )
...
Dutch translation updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-17 12:43:15 +00:00
29518ba0cf
Merged r11015 from trunk to 2.2-stable ( #12605 , #12608 )
...
Norwegian translation changed by Ketil Mehl.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-16 07:34:34 +00:00
acd27b9eb1
Merged r11014 from trunk to 2.2-stable ( #12605 )
...
Norwegian translation for 1.4-stable updated by Ketil Mehl.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-16 07:34:09 +00:00
6445b5997c
Merged r11012 from trunk to 2.2-stable ( #12607 )
...
Japanese translation for 2.2-stable updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11016 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-16 07:33:39 +00:00
416d33973f
Merged r10991 from trunk ( #12568 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11009 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:55:50 +00:00
82c7dc11d2
Merged r10992 from trunk ( #12400 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:52:39 +00:00
d22f782d3f
Merged r10956 from trunk ( #12513 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:51:12 +00:00
3717fdfa79
Merged r10975 from trunk ( #12566 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11002 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:49:31 +00:00
Toshi MARUYAMA
Jean-Philippe Lang