kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,234 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

10234 Commits

Author SHA1 Message Date
Toshi MARUYAMA 260d6d2c78 Merged r12387 from trunk to 2.4-stable. 
fix disable to run test environment.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12388 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-09 04:55:22 +00:00
Toshi MARUYAMA 5b1073095a Merged r12367 and r12368 from trunk to 2.4-stable 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12369 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-07 03:51:26 +00:00
Toshi MARUYAMA 6d33524888 Merged r12365 from trunk to 2.4-stable 
prevent i18n deprecated warning

i18n 0.6.4 on Rails 3.2.16 changes behavior.
3b6e56e06f

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-07 02:06:53 +00:00
Toshi MARUYAMA b8a93cd445 Merged r12358 from trunk to 2.4-stable (#15601) 
Turkish translation updated by Mert Salih Kaplan.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12359 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-05 03:26:03 +00:00
Toshi MARUYAMA 3c0114f020 Merged r12355 from trunk to 2.4-stable. 
update Rails version 3.2.16.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12357 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-04 08:33:22 +00:00
Toshi MARUYAMA cfe0ff70fb Merged r12340 from trunk to 2.4-stable. 
use escaping html in wiki_syntax_detailed.html.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12342 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-25 05:46:19 +00:00
Toshi MARUYAMA afab881b01 Merged r12339 from trunk to 2.4-stable (#15524) 
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12341 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-25 05:45:43 +00:00
Toshi MARUYAMA f9d083a94b Merged r12331 from trunk to 2.4-stable (#9442) 
use escaping html in Russian wiki_syntax.html.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-23 23:42:55 +00:00
Toshi MARUYAMA 5ae3de8c06 Merged r12326 from trunk to 2.4-stable (#9442) 
Russian wiki syntax help translations by Denis Savitsky.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12327 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-23 18:52:09 +00:00
Jean-Philippe Lang 931c198de4 Merged r12314. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-23 08:27:16 +00:00
Jean-Philippe Lang bf3d9f0851 Merged r12310 (#15414). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-23 08:24:00 +00:00
Jean-Philippe Lang a74ffeff07 Merged r12311 (#15427). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12312 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-22 23:28:12 +00:00
Toshi MARUYAMA 1cf93f6e32 Merged r12302 from trunk to 2.4-stable (#15391, #15401) 
Fix wiki syntax "bold italic".

Contributed by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12307 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-19 13:22:50 +00:00
Toshi MARUYAMA cd13c5e6d1 Merged r12301 from trunk to 2.4-stable (#15391, #15400) 
Czech Wiki syntax traslation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12306 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-19 13:22:11 +00:00
Toshi MARUYAMA 9bae5a7695 Merged r12300 from trunk to 2.4-stable (#15395) 
German translation updated by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12305 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-19 13:21:59 +00:00
Toshi MARUYAMA 496abc8ee3 Merged r12299 from trunk to 2.4-stable (#15391, #15402) 
Czech traslation for 2.4-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12304 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-19 13:21:48 +00:00
Toshi MARUYAMA caed8500a3 Merged r12296 from trunk to 2.4-stable (#15376) 
Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-18 08:24:02 +00:00
Jean-Philippe Lang 80aa5f4058 Merged r12292. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12293 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-17 11:23:12 +00:00
Jean-Philippe Lang 6ff53935a2 Merged r12288 (#15369). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12289 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-16 08:48:17 +00:00
Jean-Philippe Lang b5a605c808 Fixed UI tests. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12286 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-16 08:45:02 +00:00
Jean-Philippe Lang 4710cd8e6f Merged r12265, r12268, r12272 (#15307). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-16 07:48:27 +00:00
Jean-Philippe Lang a435ca7278 Merged r12278 (#15311). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12281 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-15 20:35:37 +00:00
Jean-Philippe Lang c462a8790e Merged r12277 (#15344). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12280 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-15 20:33:35 +00:00
Toshi MARUYAMA 42a2dbd4ab Merged r12274 from trunk to 2.4-stable (#13348) 
fix repository tree can't handle two loading at once.

Contributed by Vadim Pushtaev.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12276 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-13 10:16:02 +00:00
Jean-Philippe Lang 6628610ed6 Merged r12267. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12271 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-11 21:41:10 +00:00
Jean-Philippe Lang ddef51599b Merged r12269. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-11 21:16:05 +00:00
Jean-Philippe Lang 84100235e0 Set version to 2.4.0 stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 11:21:50 +00:00
Jean-Philippe Lang 000ad0ac6f Added 2.4-stable branch. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12262 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 11:11:34 +00:00
Jean-Philippe Lang 6ccdee7713 Fixed that rake db:create fails with JRuby (#15218). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 10:33:35 +00:00
Toshi MARUYAMA ccf55e65f0 ci.rake: use 'jdbcsqlite3' for JRuby 
git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 08:17:49 +00:00
Toshi MARUYAMA 0707c7a12d ci.rake: code format cleanup 
git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 08:17:40 +00:00
Toshi MARUYAMA 882c4495c0 work around "rake db:create:all" error on JRuby SQLite3 
<pre>
$ bundle exec rake ci --trace
...
rake aborted!
stack level too deep
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)'
org/jruby/RubyHash.java:1375:in `each_value'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12256 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 00:19:17 +00:00
Toshi MARUYAMA 303fdc2913 remove trailing white-spaces from test/unit/project_members_inheritance_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:47:40 +00:00
Toshi MARUYAMA b96941763d upgrade activerecord-jdbc-adapter to 1.3.2 
git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:44:44 +00:00
Toshi MARUYAMA 44012ec6c6 remove trailing white-spaces from test/unit/query_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12253 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 13:10:19 +00:00
Toshi MARUYAMA 979d3400ab remove trailing white-spaces from test/unit/setting_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12252 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 12:48:19 +00:00
Jean-Philippe Lang bff12254ac Custom fields in issue form - splitting is incorrect (#15227). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:19:06 +00:00
Jean-Philippe Lang d89c968bb1 Accept issue id with leading sharp when adding a related issue. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:09:50 +00:00
Jean-Philippe Lang f4aff7919a Log errors when moving attachments (#15295). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:46:55 +00:00
Jean-Philippe Lang 10e29f2223 Accept custom field format added at runtime (#15277). 
Patch by Boris Bera.

git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:07:48 +00:00
Jean-Philippe Lang 1871378648 Gantt: sort versions like on the roadmap (#7335). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 08:54:45 +00:00
Jean-Philippe Lang 3661766edc Upgrade to Rails 3.2.15. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:51:00 +00:00
Jean-Philippe Lang 71b43ea1c7 Wiki Pages REST API with version returns wrong comments (#15235). 
Patch by Yukinari TOYOTA.

git-svn-id: http://svn.redmine.org/redmine/trunk@12245 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:42:54 +00:00
Toshi MARUYAMA 2e1f80dcde Gemfile: remove "i18n" 
activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 06:24:28 +00:00
Toshi MARUYAMA 56639689e0 back out r12241 (back out Rails version 3.2.13) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:45:44 +00:00
Toshi MARUYAMA 2cc413351a Gemfile: update Rails version 3.2.15 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:18:06 +00:00
Jean-Philippe Lang 918ec276f1 Fixed test failure (#15182). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12240 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 11:50:16 +00:00
Jean-Philippe Lang ba083225b7 Return to section anchor after wiki section edit (#15182). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 09:03:08 +00:00
Jean-Philippe Lang 7f22cc6113 Upgrade CodeRay to 1.1.0 (#8253). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:55:50 +00:00
Jean-Philippe Lang e162f87964 Replaces <option value=""></option> which is not HTML5 valid (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:08:45 +00:00