Commit Graph

1488 Commits

Author SHA1 Message Date
Jean-Philippe Lang 805debddd0 Merged r12910 and r12911 (#16091).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:11:59 +00:00
Jean-Philippe Lang 1ad33134d3 Enable the watching of news (#2549).
git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 11:54:21 +00:00
Jean-Philippe Lang 98cbbdf7f1 Reverts r12855.
git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 11:45:25 +00:00
Jean-Philippe Lang 3d64938adc Adds JS response support to #render_error (#15760).
git-svn-id: http://svn.redmine.org/redmine/trunk@12855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 09:26:27 +00:00
Jean-Philippe Lang 8b58c95212 Code cleanup.
git-svn-id: http://svn.redmine.org/redmine/trunk@12851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:00:39 +00:00
Jean-Philippe Lang 7b127ee489 Show tabs for existing custom field types only and adds a view for choosing the type when adding a new custom field.
git-svn-id: http://svn.redmine.org/redmine/trunk@12849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 07:57:59 +00:00
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA 077598fe4b remove unneeded Relation#all from WorkflowsController
git-svn-id: http://svn.redmine.org/redmine/trunk@12721 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 01:08:40 +00:00
Jean-Philippe Lang ddb6b7d1e9 Successful update notice for workflows (#15831).
git-svn-id: http://svn.redmine.org/redmine/trunk@12706 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-25 13:17:08 +00:00
Jean-Philippe Lang a2f869b43e Redirect to back_url or referer when clicking "Sign in" while already logged-in (#15926).
git-svn-id: http://svn.redmine.org/redmine/trunk@12705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-25 12:35:05 +00:00
Jean-Philippe Lang e391be4086 Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-24 10:28:12 +00:00
Jean-Philippe Lang a525bc8e98 Don't display default watchers checkboxes on the new issue form when there are more than 20 members (#8562).
git-svn-id: http://svn.redmine.org/redmine/trunk@12673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-19 10:01:14 +00:00
Jean-Philippe Lang b9f45c80c6 Code cleanup (#14766).
Patch by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12658 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 13:29:53 +00:00
Toshi MARUYAMA 7484cf07b6 cleanup syntax of Relation#all at WikiController#export
git-svn-id: http://svn.redmine.org/redmine/trunk@12620 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 06:03:38 +00:00
Toshi MARUYAMA 2066969c7d code format cleanup WikiController
git-svn-id: http://svn.redmine.org/redmine/trunk@12618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 05:51:18 +00:00
Toshi MARUYAMA a7b8e6c02a Rails4: replace deprecated find_all_by_* at WatchersController
git-svn-id: http://svn.redmine.org/redmine/trunk@12616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 12:49:52 +00:00
Toshi MARUYAMA a3f0dae9c4 Rails4: replace deprecated find_all_by_* at RepositoriesController#committers
git-svn-id: http://svn.redmine.org/redmine/trunk@12615 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 12:49:35 +00:00
Toshi MARUYAMA b02429e864 Rails4: replace deprecated find_all_by_* at TimelogController#find_time_entries
git-svn-id: http://svn.redmine.org/redmine/trunk@12603 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 10:40:46 +00:00
Toshi MARUYAMA c57490f48e cleanup syntax of Relation#all at QueriesController#index
git-svn-id: http://svn.redmine.org/redmine/trunk@12602 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 10:30:57 +00:00
Toshi MARUYAMA 72715ec78e cleanup syntax of Relation#all at MembersController#index
git-svn-id: http://svn.redmine.org/redmine/trunk@12601 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 10:30:33 +00:00
Toshi MARUYAMA fe6ef59e37 cleanup syntax of Relation#all at IssueStatusesController#index
git-svn-id: http://svn.redmine.org/redmine/trunk@12600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 10:30:10 +00:00
Toshi MARUYAMA b652f7fc27 cleanup syntax of Relation#all at NewsController#index
git-svn-id: http://svn.redmine.org/redmine/trunk@12594 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 08:13:47 +00:00
Toshi MARUYAMA 4292f4116b Rails4: replace deprecated Relation#count with finder options at ProjectsController#show
git-svn-id: http://svn.redmine.org/redmine/trunk@12592 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 07:46:53 +00:00
Toshi MARUYAMA 3fcd5d529c add missing Relation#all at WorkflowsController#copy of r12583
git-svn-id: http://svn.redmine.org/redmine/trunk@12585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 04:19:47 +00:00
Toshi MARUYAMA ee49bdd81b Rails4: replace deprecated find_all_by_* at WorkflowsController#copy
git-svn-id: http://svn.redmine.org/redmine/trunk@12583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 04:11:36 +00:00
Toshi MARUYAMA 0a72533b59 Rails4: replace deprecated Relation#update_all at IssuesController
git-svn-id: http://svn.redmine.org/redmine/trunk@12580 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 03:39:51 +00:00
Toshi MARUYAMA 09147940fa Rails4: replace deprecated find_all_by_* at IssuesController
git-svn-id: http://svn.redmine.org/redmine/trunk@12579 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-10 03:39:35 +00:00
Toshi MARUYAMA 273e7420d4 Rails4: replace deprecated passing options to find at MessagesController
git-svn-id: http://svn.redmine.org/redmine/trunk@12520 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-08 06:11:46 +00:00
Toshi MARUYAMA d731c036fb Rails4: replace deprecated find_all_by_* at GroupsController
git-svn-id: http://svn.redmine.org/redmine/trunk@12518 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-08 05:55:52 +00:00
Jean-Philippe Lang 5ee277fa22 Fixed that OpenID authentication fails with 422 error due to token verification (#15735).
git-svn-id: http://svn.redmine.org/redmine/trunk@12438 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 12:04:38 +00:00
Jean-Philippe Lang c6fc1a8047 Fixed that filtering time entries on activity does not take care of activity overrides (#15623).
git-svn-id: http://svn.redmine.org/redmine/trunk@12414 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-15 09:49:12 +00:00
Jean-Philippe Lang ebb8e86122 Removed hardcoded formats for right-click edit.
git-svn-id: http://svn.redmine.org/redmine/trunk@12402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 08:57:30 +00:00
Jean-Philippe Lang 2e2e2cfe42 Merged custom fields format refactoring.
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 08:22:43 +00:00
Jean-Philippe Lang 6032263d9b Fixed that preferences are not preserved when adding a user fails (#15552).
git-svn-id: http://svn.redmine.org/redmine/trunk@12350 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-29 21:43:29 +00:00
Jean-Philippe Lang 5c0078c63a Fixed that non-GET API requests respond with 422 (#15427).
git-svn-id: http://svn.redmine.org/redmine/trunk@12311 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-22 22:57:30 +00:00
Jean-Philippe Lang f69b4da75f Add an indication to admin/info whether or not ImageMagick convert is available (#15311).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@12278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-15 20:11:00 +00:00
Jean-Philippe Lang 71c61f4996 Fixed that update_form always proposes the default status when updating an existing issue (#15344).
git-svn-id: http://svn.redmine.org/redmine/trunk@12277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-15 19:59:19 +00:00
Jean-Philippe Lang a22242ed20 Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.
git-svn-id: http://svn.redmine.org/redmine/trunk@12273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-11 22:02:21 +00:00
Jean-Philippe Lang 0569005759 Code cleanup: unverified request no longer raises a InvalidAuthenticityToken exception.
git-svn-id: http://svn.redmine.org/redmine/trunk@12267 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-11 20:59:17 +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 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 5f747faa58 Fixed that viewing/editing a wiki page without WikiContent raises an error (#14986).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12220 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 11:19:47 +00:00
Jean-Philippe Lang 94e7df78ca Fixed that controller_issues_edit_before/after_save hooks have no controller context (#15044).
Patch by Jordan Hollinger.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12219 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:31:04 +00:00
Jean-Philippe Lang 7bea176cdb Avoid lots of CustomField.find_by_id calls when displaying an issue history with custom fields (#15072).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12217 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:04:59 +00:00
Jean-Philippe Lang 60d6e16978 Fixed that non array commit_update_keywords raises an error (#7590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:03:13 +00:00
Jean-Philippe Lang b6cb7aa8e3 Ability to define commit keywords per tracker (#7590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 07:37:49 +00:00
Toshi MARUYAMA b8aa4da28a remove unneeded "require 'diff'" from WikiController (#15105)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-11 17:37:51 +00:00
Jean-Philippe Lang a77b462a53 Support for multiple issue update keywords/rules in commit messages (#4911).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 09:41:11 +00:00
Jean-Philippe Lang 886284b33f REST API: custom fields definition (#11159).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 10:08:30 +00:00
Toshi MARUYAMA 33ef601b12 gender neutral source comment at app/controllers/my_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12088 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-06 06:27:30 +00:00