Commit Graph

4852 Commits

Author SHA1 Message Date
Jean-Philippe Lang aa4fc1b58a Merged r11696 from trunk (#13618).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-01 12:15:49 +00:00
Jean-Philippe Lang ca39b05420 Merged r11692 from trunk (#13586).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-03 17:04:40 +00:00
Toshi MARUYAMA 4b5fa08f66 Merged r11671, r11672 and r11674 from trunk to 2.3-stable (#13405)
Fixed commit link title escaping.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-22 01:04:22 +00:00
Jean-Philippe Lang 5745a2a2e3 Merged r11641 and r11642 from trunk (#8794).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 18:40:26 +00:00
Jean-Philippe Lang f98f9b9ae1 Merged r11640 from trunk (#12968).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11655 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 18:37:33 +00:00
Toshi MARUYAMA cfec2018e3 Merged r11648, r11649, r11650 from trunk to 2.3-stable.
upgrade Rails 3.2.13.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-19 08:21:46 +00:00
Toshi MARUYAMA 338d7ea91d Merged r11637 from trunk to 2.3-stable (#13354)
PDF: fix incompatible character encodings: UTF-8 and ASCII-8BIT.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11639 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-16 08:04:42 +00:00
Toshi MARUYAMA 594d9e9da2 Merged r11613 from trunk to 2.3-stable.
Fixing HTML in groups index view.

Contributed by Gregor Schmidt.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-13 00:32:53 +00:00
Jean-Philippe Lang 94ecabbaf9 Merged r11605 from trunk (#13301).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11606 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-12 17:09:28 +00:00
Jean-Philippe Lang cfdd85173f Merged r11526 and r11590 from trunk (#13341).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11591 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-11 18:00:39 +00:00
Jean-Philippe Lang 23c28c1ef7 Merged r11582 from trunk (#13337).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 13:16:09 +00:00
Jean-Philippe Lang 974863e8f4 Merged r11525 from trunk (#11498).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11581 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 12:36:44 +00:00
Jean-Philippe Lang 58af20746b Merged r11522 from trunk (#13340).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11580 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-10 12:35:20 +00:00
Jean-Philippe Lang b0b7f4d7d6 Merged r11506 from trunk (#13329).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 11:00:33 +00:00
Jean-Philippe Lang 53680edb2d Merged r11497 from trunk (#13329).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11574 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:59:22 +00:00
Jean-Philippe Lang 0ab90145fe Merged r11571 from trunk (#12122).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11572 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:45:12 +00:00
Jean-Philippe Lang f4def66c58 Merged r11518 from trunk (#8529).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:19:39 +00:00
Jean-Philippe Lang 4413e0e52e Merged r11519 and r11520 from trunk (#13335).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:17:26 +00:00
Jean-Philippe Lang 511099e9ca Merged r11521 from trunk (#3371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11563 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 09:13:01 +00:00
Jean-Philippe Lang a18db94c06 Merged r11472 from trunk (#3107).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11562 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 09:11:44 +00:00
Toshi MARUYAMA a4b6928a26 Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641)
fix that diff outputs become ??? in some non ASCII words.

Contributed by Filou Centrinov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 21:03:55 +00:00
Jean-Philippe Lang 58ebb87ae6 Merged r11510 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11517 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-01 16:22:37 +00:00
Jean-Philippe Lang 33ef9fbe29 Merged r11508 from trunk (#13301).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11516 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-01 16:22:02 +00:00
Jean-Philippe Lang b0fa5e7305 Merged r11513 from trunk (#13328).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11515 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-01 16:20:27 +00:00
Jean-Philippe Lang 5bb2f5e211 Merged r11509 and r11512 from trunk (#13309).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11514 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-01 16:19:05 +00:00
Jean-Philippe Lang 92507382b4 Merged r11461, r11462 from trunk (#13251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11463 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-24 10:06:27 +00:00
Jean-Philippe Lang 78997eea16 Typo.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 13:53:47 +00:00
Jean-Philippe Lang d255e98023 Adds an helper for rendering query columns selection.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 12:14:22 +00:00
Jean-Philippe Lang 1ac8fd8c42 Adds helpers for query columns selection.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11451 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 12:04:29 +00:00
Jean-Philippe Lang aca59db4cc Rename issues CSV and PDF exports.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11449 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 11:10:10 +00:00
Jean-Philippe Lang 797a9f1ea9 Refactor: #issues_to_csv and #entries_to_csv merged into QueriesHelper#query_to_csv.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11448 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 11:07:43 +00:00
Jean-Philippe Lang 9b1ebd6808 Refactor: makes issue id a regular QueryColumn.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11447 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 10:53:21 +00:00
Jean-Philippe Lang d1244b31a4 Fixed that requesting a message from an invalid forum should respond with 404 (#13232).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11446 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-20 20:59:52 +00:00
Jean-Philippe Lang f88e4225c1 Removed hard-coded style in watchers list.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11444 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-20 20:46:42 +00:00
Jean-Philippe Lang aca31973c2 Fixed that delete watcher link was broken by r11290 (#13231).
Deleting a watcher now use DELETE /watchers instead of POST /watchers/destroy.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11443 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-20 20:43:28 +00:00
Jean-Philippe Lang f8c649320f Makes all time entry columns available in the CSV export.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-19 20:41:54 +00:00
Jean-Philippe Lang af92686c62 Fixed that float custom fields do not use CSV decimal separator (#10364).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11441 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-19 20:01:00 +00:00
Jean-Philippe Lang 504116bfca Add login to /users/:id API for current user (#13155).
Patch by Jérôme Bataille.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 17:24:54 +00:00
Toshi MARUYAMA f76dcf33ef fix typo at app/models/user.rb (#5719)
Contributed by Tom Copeland.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 11:00:21 +00:00
Jean-Philippe Lang 64bbf64fb6 Optimizes the SQL query behind Principal#member_of.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11426 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 12:41:31 +00:00
Jean-Philippe Lang d8e4a8fb32 Use #per_page instead of #items_per_page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 11:35:42 +00:00
Jean-Philippe Lang c17ec1643c Fixed that messages are not sorted by last reply (#12243).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 11:10:17 +00:00
Toshi MARUYAMA dbf1fed6fb replace tabs to spaces at app/controllers/boards_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11423 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:17:33 +00:00
Toshi MARUYAMA e79b232a02 replace tabs to spaces at app/models/issue.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11422 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:17:10 +00:00
Toshi MARUYAMA e478f3044e replace tabs to spaces at app/models/setting.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11421 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:16:46 +00:00
Toshi MARUYAMA a39f9bcec0 replace tabs to spaces at app/helpers/application_helper.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11420 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:16:21 +00:00
Toshi MARUYAMA e0215681b4 remove trailing tabs from app/controllers/users_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11419 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:15:44 +00:00
Toshi MARUYAMA 51abe725ba remove trailing tabs from app/controllers/projects_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11418 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:15:10 +00:00
Toshi MARUYAMA c0a5796443 remove trailing tabs from app/controllers/admin_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11416 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:14:35 +00:00
Toshi MARUYAMA e31a8e2cb3 remove trailing tabs from app/models/project.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11415 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-17 10:14:08 +00:00