Commit Graph

1022 Commits

Author SHA1 Message Date
Jean-Philippe Lang 3c19cacf97 Replaces TimeEntry.visible_by with a visible scope.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:40:03 -07:00
Toshi MARUYAMA 1c0e7790be scm: recovery showing "root @ branch" in repository tree viewing.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
Jean-Philippe Lang fec6eb782c Moved wiki page updated_on eager load to a scope and fixed timestamp titles on wiki page index (#7818).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5098 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:55 -07:00
Jean-Philippe Lang 784bbccfc6 Fixed: error on JournalsController#index when custom fields are present (#7795).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Jean-Philippe Lang 6f5707c2b5 Adds email notifications support for news comments (#2074).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:39 -07:00
Jean-Philippe Lang c9497f39b8 Keep track of issue description changes (#746).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
Jean-Philippe Lang 40787ff43f Do not responde with javascript on regular requests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:07:19 -07:00
Jean-Philippe Lang cc2d6f3605 Allow additional workflow transitions for issue author and assignee (#2732).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -07:00
Toshi MARUYAMA 49fde3723b scm: fix diff revision param validation.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00
Eric Davis b96115bf7b [#310 LSS#5727] Add checkbox option to determine if issue emails should be sent 2011-03-30 11:48:59 -07:00
Toshi MARUYAMA 6cd9bc5ca5 scm: space and tab cleanup of app/controllers/repositories_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
Toshi MARUYAMA 3d11a22624 scm: fix non ASCII filename downloaded from repo is broken on Internet Explorer (#7288).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
Eric Davis 1aa20b17b4 [#302] Protect ApplicationController methods so they are not considered actions 2011-03-24 14:22:21 -07:00
Stephan Eckardt 2c67f6103b replaced auth_source_id.nil? with change_password_allowed? in users controller 2011-03-24 13:55:50 -07:00
Felix Schäfer 10dffcf3b9 Get the autologin cookie name from the config #273 2011-03-20 10:18:17 +01:00
Eric Davis ae0851ddb4 [#280] Include matching issue ids in the auto_completer.
Using SQL CAST() to convert the issue ids to strings so LIKE will work
properly.
2011-03-13 17:11:04 -07:00
Felix Schäfer c8e584e894 Add the custom_fields helper to JournalsController #267 2011-03-07 19:44:11 +01:00
Felix Schäfer 7e99e2714b 404 on board index when no board configured. #64 2011-02-24 14:19:01 +01:00
Eric Davis 99a12ecbcf [#129] Replace public strings using Redmine with ChiliProject 2011-02-19 20:38:50 -08:00
Jean-Philippe Lang e6bf7ea34b Fixed: Relations are not displayed after adding/removing an issue relation (#7463).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:16 -08:00
Jean-Philippe Lang ef32606c43 Set the httponly flag on the autologin cookie.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4757 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 4adf3abf83 Makes the autologin cookie configurable (#1763).
The cookie attributes (name, path, secure) can now be set in config/configuration.yml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang c2a530f8c8 Moves relations fetching from views to the controller and skip invalid relations (#7385).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA e1667dabbf scm: use format_revision() for history, view and annotate (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4733 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:31 -08:00
Jean-Philippe Lang e14e244f7b Use #blank? instead of #nil? || #empty?.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4711 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 20:24:03 +00:00
Jean-Philippe Lang 7d0b1b3830 Respond with 404 instead of 500 when revision/entry is not found in the repository (#7307).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 20:22:36 +00:00
Toshi MARUYAMA 98b3a50657 scm: fix error on revision page for empty revision (#7307).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-13 12:04:30 +00:00
Toshi MARUYAMA ebb19c5863 scm: changing two revision diff text at SCM adapter level (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:04:07 +00:00
Toshi MARUYAMA 3ad213c29a Fix associated revisions label on issue page.
r4613 shows git long hash value.

Contributed by Yuya Nishihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-08 00:19:51 +00:00
Jean-Philippe Lang 9222cf91ea Changes ProjectsController#modules param name and add tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4647 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-06 20:57:17 +00:00
Jean-Philippe Lang 072c4ad14c Verify HTTP method on ProjectsController#create.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4646 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-06 20:46:22 +00:00
Jean-Philippe Lang 9fb770ba50 Moves enabled_module_names param to project attribute so that it can be set through the Project API.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4645 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-06 20:36:31 +00:00
Jean-Philippe Lang 2d9b9362a9 Fixed: should redirect to the new project when copying a project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 11:42:37 +00:00
Toshi MARUYAMA 2e1bcb2abf Changing revision label and identifier at SCM adapter level (#3724, #6092)
Contributed by Yuya Nishihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4613 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 09:45:05 +00:00
Jean-Philippe Lang d2cc2861de Find visible issues only in ContextMenusController#issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4580 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-29 19:55:52 +00:00
Jean-Philippe Lang e9a0e6dbc8 Takes more parameters into account to determine activity freshness (#7188).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4579 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-29 19:37:42 +00:00
Jean-Philippe Lang 07fe46e9df Makes the API accepts the X-Redmine-API-Key header to hold the API key.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-23 14:49:14 +00:00
Jean-Philippe Lang 283d25d823 Makes /projects API accept same pagination parameters as other API collection resources.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4572 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-23 13:34:44 +00:00
Jean-Philippe Lang d076c19822 Makes API accept offset/limit or page/limit parameters for retrieving collections.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4571 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-23 13:33:01 +00:00
Jean-Philippe Lang 03397f605c Fixes valid revision regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4549 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 18:47:54 +00:00
Jean-Philippe Lang 599bc45073 Adds support for requesting information about current user using /users/current (#7141).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 17:45:09 +00:00
Jean-Philippe Lang 84dd413f22 Restore rev param validation that was removed in r2840.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-18 18:37:49 +00:00
Jean-Philippe Lang 93847ae337 Fixes a data disclosure issue introduced in r3941.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4535 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-18 17:11:41 +00:00
Jean-Philippe Lang 335f8da5e8 Fixed: 404 when entering time with blank issue id (#7099).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-14 18:29:24 +00:00
Jean-Philippe Lang ac60fc9c1c Refactor and add tests for News #index API (#7072).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4505 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 17:00:52 +00:00
Jean-Philippe Lang 29e0bca43a Make sure there's no nil result in auto_complete.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4503 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 16:06:43 +00:00
Jean-Philippe Lang a8b12bcb52 Autocomplete issue relations on subject (#3170).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4502 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 16:04:28 +00:00
Jean-Philippe Lang a49c7f95e2 Fixes password sending when creating user.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4500 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 15:26:55 +00:00
Jean-Philippe Lang 0a2ec6ef04 Extracts user groups assignment from controller.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4499 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 15:13:34 +00:00
Jean-Philippe Lang 2066b2f666 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4497 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 14:25:23 +00:00
Jean-Philippe Lang 9e2d401f43 Moves mail_notification param to user hash param so that it can be set using the User API.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4496 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 14:19:24 +00:00
Jean-Philippe Lang cde02954c8 Moves password param to user hash param so that it can be set using the User API.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 13:39:55 +00:00
Jean-Philippe Lang a4d7a99c22 Declare safe attributes for User and Projects models.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4492 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 13:19:07 +00:00
Jean-Philippe Lang 00d50157d3 Restores object count and adds offset/limit attributes to API responses for paginated collections (#6140).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4489 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 13:13:49 +00:00
Jean-Philippe Lang 224921460a Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 17:43:39 +00:00
Jean-Philippe Lang 37ed02553a Fixes test failure in r4461.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4462 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 10:40:44 +00:00
Jean-Philippe Lang f7cf8aa878 Adds REST API for TimeEntries (#6823).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4461 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 10:13:15 +00:00
Jean-Philippe Lang 9284a32c9a Moves project attributes default assignments from ProjectsController#new to the model (#6064).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4460 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 16:15:16 +00:00
Jean-Philippe Lang 735a83c596 Converts IssuesController to use the new API template system and makes xml/json responses consistent (#6136).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 13:52:07 +00:00
Jean-Philippe Lang a1f12e3ade Converts ProjectsController to use the new API template system.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4456 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 12:06:14 +00:00
Jean-Philippe Lang d0a3aab2e7 Adds a reusable method to render API response on validation failure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4455 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 11:51:06 +00:00
Jean-Philippe Lang ea59d93dc8 Dry Users API responders.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4454 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 11:45:55 +00:00
Jean-Philippe Lang e9775097ec Adds xml/json REST API for Users (#6260).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 11:28:44 +00:00
Jean-Philippe Lang 96ce0f017c Adds a builder-like template system for rendering xml and json API responses.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 11:25:21 +00:00
Jean-Philippe Lang 483133285e Add responders to UsersController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4451 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 09:39:56 +00:00
Jean-Philippe Lang ae3fd4cb59 Accept key auth for ProjectsController#show (#6841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4444 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 16:41:52 +00:00
Jean-Philippe Lang 3d6cb1435c Accept key auth for ProjectsController#destroy (#6841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4443 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 16:37:15 +00:00
Jean-Philippe Lang 054b7d28f1 Accept key auth for ProjectsController#update (#6841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 16:32:48 +00:00
Jean-Philippe Lang 8458faed11 Accept key auth for ProjectsController#create (#6841).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4441 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 16:26:13 +00:00
Jean-Philippe Lang 620c48fbbb Reload themes so that new themes can be used without restarting Redmine (#5712).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4432 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 14:06:11 +00:00
Jean-Philippe Lang 4a6a551d07 Fixed: Missing template wiki/update.erb error introduced in r4272 (#6987).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4429 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 10:34:44 +00:00
Jean-Philippe Lang 8bb75da1ac Initialize TimeEntry attributes with params when editing an issue (#5441).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4411 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-17 18:27:38 +00:00
Jean-Philippe Lang 3ba3c540fb Prevents NoMethodError when requesting /time_entries/edit without an id (#6904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4410 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-16 20:27:45 +00:00
Jean-Philippe Lang eaab2ede76 Makes projects API return XML description when creating a project (#6874).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4397 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-13 10:05:43 +00:00
Jean-Philippe Lang 0eb7d8f614 Moved some permission checks for issue update from controller to model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4393 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-11 16:37:16 +00:00
Jean-Philippe Lang 44c9ad687f Reverted r4381.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4388 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-07 22:38:10 +00:00
Jean-Philippe Lang 475530e59f Adds a "visible" option on User and Project custom fields (#1738).
If set to false, the custom field won't be display on user profile/project overview.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4382 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-07 14:15:01 +00:00
Jean-Philippe Lang 3b01ea9fa4 Removed gantt and calendar menu items that do not fit into the core project menu (#6271).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4381 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-07 12:53:45 +00:00
Jean-Philippe Lang 1c047dfeb8 Fixed: start date being filled with current date even when blank value is submitted (#6575).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4378 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 23:23:02 +00:00
Tim Felgentreff eb805ff3fd Merge remote branch 'edavis/master' into master-journalized 2010-11-05 18:50:09 +01:00
Eric Davis c55e060bab Allow key authentication when deleting issues (with tests) #6447
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-05 17:49:25 +00:00
Eric Davis 7d934c984a Allow key authentication when updating issues (with tests) #6447
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4366 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-05 17:49:20 +00:00
Eric Davis 4b1dd334a5 Allow key authentication when creating issues (with tests) #6447
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4365 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-05 16:29:56 +00:00
Tim Felgentreff 759313b181 more test fixes 2010-11-05 17:04:09 +01:00
Tim Felgentreff 65097e7d11 fixing tests 2010-11-05 11:46:03 +01:00
Tim Felgentreff 859bfa625d Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized
Conflicts:
	app/models/wiki_content.rb
	app/views/wiki/history.rhtml
	config/locales/bg.yml
	config/locales/ca.yml
	config/locales/de.yml
	test/integration/api_test/projects_test.rb
2010-11-03 16:03:39 +01:00
Jean-Philippe Lang db2ecd3010 Fixed: "Template is missing" error when validation fails on version edit (#6766).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4354 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-01 13:13:32 +00:00
Eric Davis c514dd6885 Refactor: convert WikiController to a REST resource
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-28 21:25:38 +00:00
Eric Davis e9efa5b981 Refactor: use :id instead of :page when linking to Wiki Pages
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-27 16:27:06 +00:00
Tim Felgentreff 19c7dc0094 Merge remote branch 'edavis/master' into master-journalized
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb
2010-10-26 18:28:39 +02:00
Tim Felgentreff 8cece46dd4 Merge branch 'master' into master-journalized
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/context_menus_controller.rb
	app/controllers/gantts_controller.rb
	app/controllers/issue_moves_controller.rb
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/controllers/previews_controller.rb
	app/controllers/timelog_controller.rb
	app/helpers/issues_helper.rb
	app/helpers/journals_helper.rb
	app/models/issue.rb
	app/models/journal.rb
	app/models/journal_observer.rb
	app/views/admin/projects.rhtml
	app/views/context_menus/issues.html.erb
	app/views/issues/_action_menu.rhtml
	app/views/issues/_history.rhtml
	app/views/news/_news.rhtml
	app/views/news/index.rhtml
	app/views/repositories/diff.rhtml
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	config/routes.rb
	doc/CHANGELOG
	lib/redmine.rb
	lib/redmine/export/pdf.rb
	lib/redmine/helpers/gantt.rb
	lib/redmine/version.rb
	public/stylesheets/application.css
	test/functional/context_menus_controller_test.rb
	test/functional/issues_controller_test.rb
	test/functional/journals_controller_test.rb
	test/functional/previews_controller_test.rb
	test/functional/users_controller_test.rb
	test/functional/wiki_controller_test.rb
	test/integration/routing_test.rb
	test/unit/issue_test.rb
	test/unit/mailer_test.rb
	test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
Eric Davis 70bf0706b2 Refactor: convert WikiController#destroy to use HTTP DELETE
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4295 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-26 15:59:20 +00:00
Eric Davis 397222f198 Allow adding notes when moving issues
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4292 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-25 18:44:46 +00:00
Eric Davis 22e3cba0b7 Allow changing the Priority when moving issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4291 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-25 18:44:41 +00:00
Eric Davis 4b045badcf Refactor: Rename WikiController#page_index to #index
index is the action that should list a collection of records, which is
what #page_index does.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4290 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-25 16:16:46 +00:00
Jean-Philippe Lang 7824eca775 Refactor: merged error rendering methods.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 11:07:04 +00:00
Jean-Philippe Lang eea456ed84 Improved error message when trying to access an archived project (#2995).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 09:48:01 +00:00
Eric Davis cac3b1e538 Refactor: split WikiController#edit into #update
update will handle the saving and should be accessed via POST only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 16:20:20 +00:00
Eric Davis c259ada6e1 Refactor: rename WikiController#index to #show, it's a single resource action
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-21 16:07:28 +00:00