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

113 Commits

Author SHA1 Message Date
Holger Just 0c87f611e9 Merge branch 'master' into unstable 
Conflicts:
	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/fa.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/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.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
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
 2012-01-04 16:41:10 +01:00
Holger Just e95b4992e4 Update copyright for 2012 
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
 2012-01-03 20:36:40 +01: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 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02: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
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang 5f3d184880 Modules selection lost on project form after validation failure (#8012). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -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 99a12ecbcf [#129] Replace public strings using Redmine with ChiliProject 2011-02-19 20:38:50 -08: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
Jean-Philippe Lang df88dc117f Fixed: r4492 breaks the ability to select issue custom fields available for projects issues (#7121). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4529 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 16:10:46 +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 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 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
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
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
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 76fcf136d0 Redirect to project settings after copying a project. #6443 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4185 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-26 18:04:54 +00:00
Eric Davis bf7476af5b Refactor: split method ProjectsController#edit to ProjectsController#update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4070 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-08 16:01:51 +00:00
Eric Davis 2295b61cb6 Refactor: rename method ProjectsController#add to ProjectsController#new 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4069 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-07 15:00:27 +00:00
Eric Davis 763ab07942 Refactor: split ProjectsController#add into #add (GET) and #create (POST). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4067 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-06 14:53:08 +00:00
Eric Davis c1068bf0cd Refactor: move method, ProjectsController#reset_activities to ProjectEnumerationsController#destroy. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4054 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-03 15:04:03 +00:00
Eric Davis 83b4343d2d Refactor: move method, ProjectsController#save_activities to ProjectEnumerationsController#save 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4053 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-02 17:39:56 +00:00
Eric Davis b5e90972d8 Refactor: move method, ProjectsController#add_file to FilesController#new. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4052 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-01 15:17:45 +00:00
Eric Davis daa8eaa9ae Refactor: move method, ProjectsController#list_files to FilesController#index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4051 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-31 15:12:58 +00:00
Eric Davis a188abbe28 Refactor: move method, ProjectsController#roadmap to VersionsController#index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4050 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-30 15:30:28 +00:00
Eric Davis b925325ddb Refactor: extract ProjectsController#activity to a new Activities controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-27 14:05:54 +00:00
Tim Felgentreff 1f9eda4e0d update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
Eric Davis 116c7a7964 Add a link to the cross project time entries page to /projects. #4935 
Contributed by Jan.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3802 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-20 16:29:12 +00:00
Eric Davis f3cc84b343 Show subproject versions on the Roadmap. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3760 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-05-27 17:16:10 +00:00
Jean-Philippe Lang 51c8f3143c Fixes URLs in atom feeds broken by r3681 (#5403). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3703 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-30 10:45:21 +00:00
Eric Davis 9b595c689d Refactor: Move the rest of the routing tests to RoutingTest. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-21 16:02:55 +00:00
Jean-Philippe Lang 6511e94233 Moves ProjectsController#add_issue_category to IssueCategoriesController#new. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3549 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-06 18:43:00 +00:00
Jean-Philippe Lang 729bea1cf3 Moves ProjectsController#add_version to VersionsController#new. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3548 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-06 18:25:01 +00:00
Jean-Philippe Lang dfe447f841 Fixes project editing route broken by r3313. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3314 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-01-14 22:19:53 +00:00
Jean-Philippe Lang 62c83bdd2e Adds a 'Add subprojects' permission. 
* 'Add project' permission will let user create a root project
* 'Add subprojects' permission will let project members create subprojects

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-24 16:18:15 +00:00
Jean-Philippe Lang c66943c9b8 Removes changelog view. 
All trackers can now be displayed on the roadmap. By default, only those marked as displayed on the roadmap are displayed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3162 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-12 15:23:22 +00:00
Jean-Philippe Lang a2b4bb0dfb Ability to add a new version from the issue form (#4315). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3126 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-06 11:09:12 +00:00
Jean-Philippe Lang 5f8e9d7118 Version sharing (#465) + optional inclusion of subprojects in the roadmap view (#2666). 
Each version of a project can be shared with:
* subprojects
* projects in the project hierarchy: ancestors + descendants (needs versions management permission on the root project)
* projects in the project tree: root project + all its descendants (same as above)
* all projects (can be set by admin users only)

Notes:
* when sharing a version of a private project with others projects, its name will be visible within the other projects
* a project with versions used by non descendant projects can not be archived

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3123 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-06 10:28:20 +00:00
Jean-Philippe Lang 534ce51154 Allow non admin users to add subprojects (#2963). 
Subprojects can be added to the projects for which the user has add_project permission.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3059 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-15 13:22:08 +00:00
Eric Davis 37d401ac58 When a specific TimeEntryActivity are change, associated TimeEntries will be 
re-assigned to the correct record.

* Renamed build to create since the methods now create objects.
* Removed call to Project#save that isn't needed since objects are saved directly now.
* Wrapped the activity creation and updates in a SQL transaction so TimeEntries
  will remain in a consistent state if there is an error.
* When a Project's TimeEntryActivities are destroyed, they are now
  reassigned to the parent TimeEntryActivity.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:52 +00:00
Eric Davis 5833ba9f81 Added a Activities tab to Project Settings 
* Changed Project#activities to allow getting inactive Activities also:
  * Changed the Enumeration#all named_scope to exclude project specific Activities
  * Changed the Project has_many time_entry_activities to include all by default
    and provided an #active method to filter them to active ones only
  * Split Project#activities to two methods and gave it a parameter that is used
    to determine if inactive activities are included (default is no)
* Added a reset button to delete all project specific activities.
* Added ProjectsController#reset_activities to remove the project
  specific activities
* Added a HTTP DELETE route for reset_activities
* Changed the permissions for managing project activities to have access to the
  ProjectsController#reset_activities action
* Added a way to bulk save Project specific Activities in ProjectsController
  * #save_activities will save all the changed activities, including update the
    existing records
  * Added helper methods to the controller which will be refactored later
  * Allow the same TimeEntryActivity names on different projects

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:45 +00:00
Jean-Philippe Lang ac8a67191f Renames uploaded_test_file helper. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2909 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-10 14:56:29 +00:00
Jean-Philippe Lang 21e18c1eb4 Adds missing native eol properties. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2895 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-09-20 14:06:57 +00:00