kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,149 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

196 Commits

Author SHA1 Message Date
Eric Davis ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Romano Licker 0eeeb04c31 [#692] removes div#admin-menu - now content of main menu 2011-12-09 14:04:02 -08:00
Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable 
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
 2011-12-01 17:46:05 +01:00
Felix Schäfer add0bf4d0a Don't double-escape project names in base layout. 2011-11-27 17:01:46 +01:00
Felix Schäfer 03d956c360 Merge pull request #90 from meineerde/issues/master/124-delete-registered-users 
[124] delete registered users
 2011-11-25 09:47:12 -08:00
Eric Davis ab2856b53f [#263] Add new layout and theme 
Merge branch 'ticket/unstable/263-new-layout-ready' into unstable
 2011-11-06 18:18:35 -08:00
Eric Davis f10412ef71 [#263] Update tests for views in the new layout 2011-11-06 17:46:31 -08:00
Holger Just 667c4d157f [#591] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde' 2011-10-29 21:22:35 +02:00
Felix Schäfer 6fcb1de63a Graciously handle deleted custom fields on issue history view. 2011-10-29 18:29:18 +02:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Romano Licker 34dc06a85f [#652] fixes wrong redirect after login 
when url contains umlaute
 2011-10-11 18:16:43 +02:00
Holger Just c57c598204 Fix trailing whitespace 2011-08-27 18:26:12 +02:00
Holger Just 54b4fdf1aa [#124] Allow to delete users with STATE_REGISTERED 2011-08-02 02:27:37 +02:00
Eric Davis 2d98a486d6 Fix failing test due to invalid HTML and missing initial journal 2011-07-22 11:52:55 -07:00
Eric Davis dd6d9d1c68 [#513] Fix links to attachments in the issue history 2011-07-11 18:33:32 -07:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis 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
Eric Davis bdc7325a82 Merge branch 'master' into unstable 
Conflicts:
	doc/CHANGELOG.rdoc
 2011-05-01 13:58:02 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Eric Davis 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
Jean-Philippe Lang 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
Toshi MARUYAMA 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00
Felix Schäfer 10dffcf3b9 Get the autologin cookie name from the config #273 2011-03-20 10:18:17 +01:00
Eric Davis 99a12ecbcf [#129] Replace public strings using Redmine with ChiliProject 2011-02-19 20:38:50 -08:00
et f502ea1688 Fix spelling 2011-02-18 22:15:22 -05: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 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
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-Baptiste Barth 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
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 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
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 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 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
Jean-Philippe Lang 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
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 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
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