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

3560 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
Jean-Philippe Lang c058bc2245 Remove the Description label from the issue view and omit the block if empty (#6677). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-19 19:26:07 +00:00
Jean-Philippe Lang f3baa5bfee Fixed: precedes/follows relations no longer update start/due dates (#5803). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4263 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-19 19:16:50 +00:00
Eric Davis 297eb6f81b Refactor: remove WikiController#special 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4262 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-19 15:24:16 +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 fef21d5aa2 Remember the selected "Member of Role" and "Member of Group" options. #6467 
Contributed by Yuki Kita

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4260 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-16 00:00:23 +00:00
Eric Davis ce99f3247f Use HTTP DELETE when deleting a time entry. #6674 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4259 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 23:37:01 +00:00
Eric Davis c8177b99ed Revert part of r3936. 
link_to_if_authorized no longer supports paths for the link options.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 23:11:05 +00:00
Eric Davis 5823a71c18 Revert part of r4064. 
Having link_to_if_authorized support urls has too many edge cases and isn't
working with sub-uris.  #6195 #6513

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4257 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 23:11:00 +00:00
Eric Davis 06c0e5ad1c Add rake task to send test email. (#6511) 
Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4256 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 22:50:33 +00:00
Eric Davis c20308c7ba Remove the translated string. It's definition changed in en 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 22:41:52 +00:00
Eric Davis 1bfbc012f5 Add rake tasks to add and remove keys in the locales. #6548 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 22:41:47 +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 bbbfd4ee4c Refactor: extract finder to a utility method 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4252 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-14 18:01:46 +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
Jean-Baptiste Barth 71dd4b8a7d Fixed bad markup in users/general partial 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-11 20:34:33 +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 700c302fca Change Project#notified_users to check for the 'all' notification option. #6541 
The previous mail_notification? check would always pass since the
notifications where converted to strings and strings are always true.

Also changed Project#recipients to use #notified_users instead of duplicated
code.

Based on contribution by Felix Schäfer.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-10 21:42:24 +00:00
Eric Davis d2986eb98f Correctly update all mail_notification options. #6549 
* Need to check for 't' values to support sqlite
* Need to check the membership count for the 'selected' option

Based on patch contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-10 21:17:15 +00:00
Eric Davis eabf1ff3e7 Add SortHelper so custom queries will run on the Calendar. #6612 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4245 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-10 21:17:10 +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 84ebd786d6 Fix the Log Time link on an issue page 
Contributed by Philippe Lafoucrière (gravis)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 15:01:20 +00:00
Jean-Baptiste Barth 156eca4d22 Added ability to edit issues from different project through contextual menu (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 03:09:51 +00:00
Eric Davis 73f12765a9 Don't duplicate users in Issue#assignable_users. From r4240 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 17:46:37 +00:00
Eric Davis 7798e1b1f7 Allow assigning issues back to the author. #4199 
This allows an issue to be reassigned to the author even if they are not
a project member.  Useful when passing back an issue to get more
information from the author.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4240 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 17:28:29 +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
Azamat Hackimov e59156b446 Rename task to issue in calendar (#6563) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 15:26:53 +00:00
Azamat Hackimov 5592e77fc6 Translation updates 
* de (#6598)
* ja (#6508, #6570)
* he (#6569)
* ru
* pt (#6509)
* pt-BR (#6494, #6596)
* sv (#6536)
* zh-TW (#6525)


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 15:19:28 +00:00
Jean-Baptiste Barth b255b7760a Added ability to delete issues from different projects through contextual menu (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4236 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 05:11:28 +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
Jean-Baptiste Barth c43ef6e769 Code cleanup: renamed variables in User#allowed_to? with explicit names 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-06 05:08:38 +00:00
Jean-Baptiste Barth e59c927ee5 Fixed: User#allowed_to? returning true in any case if array of projects had only one item (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4233 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-06 05:08:31 +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
Jean-Baptiste Barth 4853dd97fd Splitted #find_issues filter in ApplicationController to #find_issues and #check_project_uniqueness (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4228 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-29 05:22:53 +00:00
Jean-Baptiste Barth e8f3dd07dd Added ability to specify multiple projects in User#allowed_to? (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4227 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-29 05:22:45 +00:00
Eric Davis fda1a0cb3b Fix test failure from Setting changes in other tests 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4226 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-29 03:02:23 +00:00
Eric Davis a04e1bd582 Locale update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4225 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 22:15:56 +00:00
Eric Davis 747b9ec568 Refactor: move method to model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4224 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 22:13:11 +00:00
Eric Davis 437690119b Allow admins to edit user's email notifications and preferences. #3503 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4223 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 22:13:06 +00:00
Eric Davis 26ef9da02b Changed the notifications to use a hierarchy UI 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4222 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 21:09:06 +00:00
Eric Davis 4c9f261a24 Added three new notifiable events based on issue attributes 
* issue_note_added
* issue_status_updated
* issue_priority_updated

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4221 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 20:20:00 +00:00
Eric Davis 244e94de80 Refactor the hardcoded event actions (notifiables) to use a class 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4220 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 20:19:55 +00:00
Eric Davis 582ed86d82 Add a default mail notification setting for new users 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4219 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 18:36:50 +00:00
Eric Davis c059300d99 Added User#notify_about? to check when a user should be notified about an event 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4218 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 18:22:10 +00:00
Eric Davis a61ee73e69 Added tests for Issue#recipients 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4217 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 18:22:05 +00:00