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

1050 Commits

Author SHA1 Message Date
Eric Davis
e9efa5b981 Refactor: use :id instead of :page when linking to Wiki Pages 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 16:27:06 +00:00
Tim Felgentreff
9bb45d9e75 Fix journal_observer 2010-10-27 11:53:20 +02:00
Tim Felgentreff
1a2aa363bd fix journal observer tests, remove journal observer 2010-10-27 11:42:15 +02:00
Tim Felgentreff
8c5312e0ec more merge fixups 2010-10-26 18:58:54 +02: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
Eric Davis
17eab0f5f9 Fix wiki links on the activity page. #6746 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-26 15:44:30 +00: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
0ca74df604 Refactor: move method to model with compatibility wrapper 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 22:38:45 +00:00
Jean-Philippe Lang
d8ef4b6f4d Fixed: timelog link in the activity broken by recent refactoring (#6702). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4277 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 20:40:11 +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
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
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
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
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
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
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
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
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
0316af7f6b Converted User#mail_notification from a boolean to a string. 
The string will now store which type of notification option to use.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4216 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-28 18:22:00 +00:00
Eric Davis
83e0be5d07 Fixes reverting an issue to a status with a done_ratio of 0%. #5170 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4186 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-26 18:13:31 +00:00
Eric Davis
83bfb8cd2b Revert "Fixed: gantt broken when no due date on project issues and versions." 
It broke the tests for overdue projects and isn't a good way to fix #6350
because it makes an assumption that a project is due Today and will still
error if issue tracking is disabled.

This reverts commit a7fd592db4037d635d04ca5ce3f01d0af3f0c8ae. (r4178)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4184 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-26 17:35:18 +00:00
Jean-Philippe Lang
a7fd592db4 Fixed: gantt broken when no due date on project issues and versions. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4178 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-26 08:16:05 +00:00
Eric Davis
51359704a0 Added a users options to the reminders email 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4167 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 23:17:51 +00:00
Eric Davis
6a76aef375 Add User#allowed_to_globally? which wraps User#allowed_to? 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 16:38:00 +00:00
Eric Davis
f62a1827f3 Updated issue delete confirmation when it has child issues. #6191 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 02:55:26 +00:00
Jean-Baptiste Barth
c4d44af54c Fixed non standard SQL syntax. #6413 
Contributed by Juan G

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4091 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-16 19:28:04 +00:00
Tim Felgentreff
61fdd38435 move issue journal reply to issue controller test, as each journalized controller will now use the render_reply journals helper to reply 2010-09-15 17:50:20 +02:00
Tim Felgentreff
53fd34fbd0 message mail delivery must happen after the first journal is created 2010-09-15 17:10:22 +02:00
Tim Felgentreff
e28b809271 use direct method call 2010-09-15 14:26:42 +02:00
Tim Felgentreff
68ae2d0dfd change issue specific journal query and show_details for journal helper 2010-09-15 12:56:33 +02:00
Tim Felgentreff
6863c00359 forgot a few versioned => journaled conversions 2010-09-15 11:05:42 +02:00
Tim Felgentreff
3279b2adbd fix mailer tests 2010-09-15 10:53:00 +02:00
Tim Felgentreff
485335599a fix attachment_removal 2010-09-15 10:38:07 +02:00
Eric Davis
cdfc57d544 Change the TimelogController's to/from dates based on the project time entries 
Instead of looking for the earliest and latest time entry system wide for the
dates in the form, now TimelogController will only look at the time entries
for the current project (and parent/sub projects).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:25 +00:00
Eric Davis
8900797ada Refactor: move method to Model. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:20 +00:00
Tim Felgentreff
3b51eb54ea fix 2 more tests 2010-09-14 19:18:28 +02:00
Tim Felgentreff
9cd55d8dd4 more test fixes 2010-09-14 18:07:38 +02:00
Tim Felgentreff
d1ba27358a fix wiki content specs 2010-09-14 16:59:43 +02:00
Tim Felgentreff
68ca0636c4 init journal will return the last_journal, not the new one, now 2010-09-14 16:59:27 +02:00
Tim Felgentreff
4eb07d6ce6 fix use of versions vs journals 2010-09-14 15:18:28 +02:00
Tim Felgentreff
a6a25cc5c1 render done_ratio as decimal 2010-09-14 15:17:51 +02:00
Tim Felgentreff
72e7baafdf fix various tests in mailer, wiki content and issue helper 2010-09-14 14:25:19 +02: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
878bb55522 Refactor: move method to Project#css_classes 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4080 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-10 23:07:10 +00:00
Eric Davis
d36700eeee Refactor: replace chained finders with an inject. Should handle edge cases better. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4079 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-10 19:53:57 +00:00