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

119 Commits

Author SHA1 Message Date
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
d3381fb518 Refactor: change :id on WikiController to use :project_id 
Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4265 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-20 21:26:30 +00:00
Eric Davis
c06c22cf2e Refactor: extract method from WikiController#special 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4261 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-18 15:27:49 +00:00
Eric Davis
0271105794 Refactor: extract #page_index from WikiController#special 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4253 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 15:36:10 +00:00
Eric Davis
e8468b51cc Refactor: extract method in WikiController#special to create a new #export method 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-13 17:13:50 +00:00
Eric Davis
718816c5d4 Refactor: convert timelogs to a REST resource (:time_entries) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-12 15:55:21 +00:00
Eric Davis
435c90eb47 Refactor: extract TimelogController#edit to #update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-11 15:31:42 +00:00
Eric Davis
4acd990ee2 Refactor: extract TimelogController#create from TimelogController#edit 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4244 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 15:39:39 +00:00
Eric Davis
068771ea07 Refactor: extract TimelogController#new from #edit 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 15:51:09 +00:00
Eric Davis
2ecca7e4df Refactor: rename TimelogController#details to #index 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-06 18:23:45 +00:00
Eric Davis
e13790c62c Refactor: extract TimelogController#report to a new controller class 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-05 16:07:17 +00:00
Eric Davis
a034172b24 Refactor: convert UsersController to resource 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4231 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-04 15:36:16 +00:00
Eric Davis
86ba692bf5 Refactor: split UsersController#edit into #edit and #update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4230 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-30 18:22:46 +00:00
Eric Davis
d06a1a7fa4 Refactor: rename UsersController#add to #new 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4229 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-29 16:00:45 +00:00
Eric Davis
3a3263102a Refactor: split UsersController#add into #add and #create 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4215 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 15:28:50 +00:00
Eric Davis
79e30e7087 Refactor: convert News to a REST resource 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4214 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-27 16:51:12 +00:00
Eric Davis
deed1b949d Refactor: move NewsController#preview to PreviewsController#news 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4174 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-24 16:26:46 +00:00
Eric Davis
401197a895 Refactor: move #destroy_comment method to CommentsController#destroy 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4172 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-23 15:20:19 +00:00
Eric Davis
1f2f953687 Refactor: move NewsController#add_comment to CommentsController#create 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4170 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-22 16:25:09 +00:00
Eric Davis
01d1a02df4 Refactor: split NewsController#edit into #edit and #update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-21 15:20:37 +00:00
Eric Davis
3bc29e29e0 Refactor: split NewsController#new into #new and #create methods. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4163 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 15:13:48 +00:00
Eric Davis
969bf2107b Refactor: split VersionsController#new into #new and #create 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4090 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-16 18:27:33 +00:00
Eric Davis
be6e0927f3 Refactor: Split VersionsController#edit into #edit and #update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4088 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-15 16:50:25 +00:00
Eric Davis
1b90703157 Refactor: convert FilesController to a restful resource. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4085 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 16:24:07 +00:00
Tim Felgentreff
4b098d7774 Merge branch 'journals' into 1.0-stable 
Conflicts:
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/helpers/journals_helper.rb
	app/views/issues/_history.rhtml
	lib/redmine/activity/fetcher.rb
	test/functional/issues_controller_test.rb
	test/test_helper.rb
 2010-09-14 09:32:35 +02:00
Eric Davis
41c055363e Refactor: split FilesController#new into #new and #create. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4084 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-13 20:35:03 +00:00
Eric Davis
3a2efb4757 Refactor: convert ProjectEnumerations to a resource on a project. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4075 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-10 16:00:49 +00:00
Eric Davis
8d52608dba Refactor: convert the Projects routes to resources. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4071 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-09 18:57:21 +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
f92dcdf50a Allow setting an issue's notes via params[:issue][:notes]. (XML API) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4048 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-27 20:08:59 +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
Eric Davis
56e984b5e7 Refactor: convert many of the custom Issue routes to REST resources. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4041 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-26 16:36:59 +00:00
Eric Davis
80256cf298 Refactor: extract #bulk_update method from IssuesController#bulk_edit. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4037 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-24 15:27:12 +00:00
Eric Davis
b67b3820a1 Refactor: move IssuesController#changes to JournalsController#index. 
Since #changes is only an Atom feed of journals of a query, it makes
more sense to have it on the JournalsController resource.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4034 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-23 15:04:36 +00:00
Eric Davis
27ef72c35e Merged r4006 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4018 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:45 +00:00
Eric Davis
1fcc1bdc89 Refactor: move IssuesController#context_menu to a new controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 18:16:54 +00:00
Eric Davis
047bf692b3 Merged r3951 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:42 +00:00
Eric Davis
d457f90fcd Merged r3949 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3999 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:31 +00:00
Eric Davis
80e833cd88 Merged r3946 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3996 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:14 +00:00
Eric Davis
a12a073a6e Merged r3945 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3995 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:08 +00:00
Eric Davis
2012c60bfd Merged r3941 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:33:46 +00:00
Eric Davis
fab5064643 Merged r3936 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:33:18 +00:00
Eric Davis
2f529fd834 Merged r3918 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3968 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:30 +00:00