216619d376
Merge branch 'unstable' into ticket/unstable/123-journalized
...
Conflicts:
test/unit/journal_test.rb
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
bdc7325a82
Merge branch 'master' into unstable
...
Conflicts:
doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
ed252f7246
[ #309 ] Set the back_url after sending a lost password so HTTP_REFERER isn't used
...
Contributed by Robert Chady
2011-04-20 16:24:54 -07:00
d8fbdca760
Adds User and Version custom field format that can be used to reference a project member or version in custom fields ( #2096 ).
...
These new field formats are available for project, issue, version and time entry custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
0bf7a60480
Fix test/integration/api_test/users_test.rb fails due to changing en.yml ( #8035 , #7855 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
d16db34454
Moves jstoolbar script include tags to head.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
52397646b2
Fixed: Login page should not show projects link and search box if authentication is required ( #3715 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5007 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:40 -07:00
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
10dffcf3b9
Get the autologin cookie name from the config #273
2011-03-20 10:18:17 +01:00
99a12ecbcf
[ #129 ] Replace public strings using Redmine with ChiliProject
2011-02-19 20:38:50 -08:00
f502ea1688
Fix spelling
2011-02-18 22:15:22 -05:00
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
3b53ec20e6
Adds themes test for when Redmine is in a sub-uri.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4560 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-23 09:42:33 +00:00
523febf9c1
Support for Javascript in Themes ( #2803 ).
...
If javascripts/theme.js is found in the theme directory, it will be automatically loaded on each page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4558 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-22 21:37:07 +00:00
6d4126f17e
Adds routing tests for users and xml format.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 18:06:14 +00:00
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
17f86d964f
Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 23:24:34 +00:00
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
87ae744dce
Fixes test according to r4493.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4498 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 14:43:55 +00:00
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
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
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
5f57bceabb
Makes some attributes optional in API response to get faster/lightweight responses.
...
These attributes are not required for common uses case (eg. updating an object). They can be requested in the reponse using the 'include' parameter. Example GET /issues/1.xml?include=journals. The list of attributes that can be included in responses will be documented in the wiki.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4486 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 10:19:11 +00:00
ab6a93b029
Changes the representation of journal details in issue API.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4483 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 12:22:37 +00:00
3e3315c103
Support for updating custom fields using the received custom_fields array ( #6345 , #6403 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4481 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 10:48:16 +00:00
0e19aa4362
Fixed: error when serializing back objects with custom fields using ActiveResource ( #6403 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4480 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 10:12:19 +00:00
9157482049
Adds subtasks to GET /issues/:id API ( #5338 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4465 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 13:02:14 +00:00
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
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
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
eaf6bb1e9b
Projects API tests rewriting.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4457 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 12:49:07 +00:00
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
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
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
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
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
2fab7bd9b1
Adds leading slash to all assert_redirected_to arguments ( #6887 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4407 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-14 16:45:32 +00:00
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
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
6f841b7f43
Fixed: 'View difference' broken on wiki page history ( #6747 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4372 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 13:22:23 +00:00
eb805ff3fd
Merge remote branch 'edavis/master' into master-journalized
2010-11-05 18:50:09 +01:00
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
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
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
f0cd92c80c
Merge remote branch 'edavis/master' into master-journalized
2010-11-05 10:00:23 +01:00
c967899b14
Refactor: Convert the tests for Issues#index and #show APIs to shoulda. #6447
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4364 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-04 16:22:47 +00:00
30dc4fec99
Refactor: convert API key tests using HTTP Basic to a shoulda macro
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4363 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-03 16:48:23 +00:00
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
a04d64881c
Refactor: convert username/password http basic auth api tests to shoulda macros #6447
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-02 15:52:06 +00:00
Eric Davis
Felix Schäfer
Jean-Philippe Lang
Toshi MARUYAMA
et
Jean-Baptiste Barth
Tim Felgentreff