70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
b80b789cc6
Coderay upgraded to 0.9.7 ( #5344 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
4525b7f6e2
Fixed: subtasks are deleted (not destroyed) when destroying parent issue ( #7385 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
2c830770cb
ruby1.9 compatibility
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4602 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-01 11:45:12 +00:00
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
2ee45e8cac
Use Object#tap instead of #returning ( #6887 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4406 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-14 16:24:21 +00:00
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
77b0a56768
update to incorporate latest acts_as_journalized fixes
2010-11-05 19:53:35 +01:00
905ac8c1e6
update to incorporate latest acts_as_journalized fixes
2010-11-05 19:48:50 +01:00
0d33f6c01a
update to latest acts_as_journalized plugin
2010-11-05 18:41:37 +01:00
3e6d7637db
update actsasjournalized
2010-11-03 18:51:49 +01:00
1569aae165
updated acts_as_journalized
2010-11-03 17:46:03 +01:00
40494cbe6b
test fixes
2010-11-03 16:23:11 +01:00
fe33a89c76
fix issue_test
2010-10-27 12:19:15 +02:00
9bb45d9e75
Fix journal_observer
2010-10-27 11:53:20 +02:00
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
ebb445c364
Use the relative_url_root when generating asset_paths. #3935
...
Contributed by Daniel S from Redmine.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-17 04:06:40 +00:00
f0c657448a
Updated acts_as_journalized
2010-09-15 17:51:16 +02:00
bb37aa24dc
Update acts_as_journalized
2010-09-15 16:40:59 +02:00
5af629f31f
Update acts_as_journalized
2010-09-15 12:57:27 +02:00
aaecab6d7f
use latest acts_as_journalized
2010-09-14 19:18:43 +02:00
2dd4e3d12d
Update acts_as_journalized
2010-09-14 14:25:30 +02:00
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
bdb3937e0f
Rewrite the Gantt chart. #6276
...
This version of the Gantt chart supports nested charts. So Projects,
Versions, and Issues will be nested underneath their parents correctly.
Additional features:
* Move all Gantt code to Redmine::Helpers::Gantt class instead of having it in
the Gantt class, controller, and view
* Recursive and nest sub-projects
* Recursive and nest versions
* Recursive and nest issues
* Draw a line showing when a Project is active and it's progress
* Draw a line showing when a Version is active and it's progress
* Show a version's % complete
* Change the color of Projects, Versions, and Issues if they are late or
behind schedule
* Added Project#start_date and #due_date
* Added Project#completed_percent
* Use a mini-gravatar on the Gantt chart
* Added tests for the Gantt rendering
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4072 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-10 03:09:02 +00:00
7ca197b37f
Merged r3933 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3983 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:59 +00:00
83e4cf3dd4
Prevent 500 error on login when there's a typo in OpenID URI scheme, such as http;// or http.//
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-10 21:12:32 +00:00
bbd131ad8d
Update acts_as_journalized
2010-08-10 17:12:28 +02:00
5844623031
add acts_as_journalized into a submodule
2010-08-10 12:36:45 +02:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
47ecf151dd
completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized
...
This makes the wiki just use the versioning provided by acts_as_journalized
2010-08-04 19:01:18 +02:00
ff31875149
move to STI for journals so the journals themselves can be events
2010-07-21 17:57:45 +02:00
2287d7ce8c
with acts_as_journalized activities only have to search the journal table
2010-07-21 12:27:48 +02:00
2d282f8deb
move (almost) everything over to acts_as_journalized
2010-07-15 18:24:12 +02:00
d7768ce600
remove journals to start moving it all out to vestal_versions based plugin
2010-07-14 14:13:55 +02:00
bcbb328cd2
Merge branch 'master' of git://github.com/edavis10/redmine into journals
2010-06-29 19:27:14 +02:00
d2f8feb7c5
Optimize the N+1 query in watcher_recipients. #5415
...
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 18:41:30 +00:00
bc6805a6a6
Initial version of acts_as_journalized
2010-06-18 19:31:21 +02:00
a00d1eabd7
Fixed: watchers selection lost when issue creation fails ( #5406 ). #watched_by? was fixed in order to work with #watcher_user_ids= used in controllers on unsaved objects.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 11:02:27 +00:00
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
760c933bd7
Fixes acts_as_event with a String as url option ( #5343 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-18 10:00:11 +00:00
0097770626
Upgrade CodeRay to 0.9.2 ( #3359 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3592 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-16 20:29:12 +00:00
51d790b2f3
Reverts r1476 that is no longer needed after r3582.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 09:07:21 +00:00
8e3d1b694a
Adds subtasking ( #443 ) including:
...
* priority, start/due dates, progress, estimate, spent time roll-up to parent issues
* descendant issues tree displayed on the issue view with context menu support
* issue tree display on the gantt chart
* issue tree copy on project copy
* unlimited nesting
Defining subtasks requires the new permission 'Manage subtasks'.
Subtasks can not belong to a different project than the parent task.
Implementation is based on scoped nested sets for fast reads and updates.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-13 14:56:49 +00:00
22c1e2b8cf
Adds named scopes to replace custom finders.
...
* Adds watched_by class method in ActsAsWatchable
* Adds Issue#recently_updated, Issue#with_limit and Issue#on_active_project
#2482
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-10 05:10:43 +00:00
fe1e3ccd18
Refactor: Decouple failed attachments and the flash messages
...
Attachment#attach_files will no longer need to return a flash message,
instead it will put unsaved attachments into object#unsaved_attachments
where the calling object can access them.
A utility method #render_attachment_warning_if_needed is included for setting
the standard flash warning.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 17:05:00 +00:00
74e85953f0
Move SQL LIKE tokens to acts_as_searchable.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3445 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-17 20:20:51 +00:00
446ef61680
Korean support for PDF export ( #4639 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3389 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-07 12:30:44 +00:00
358e3194d7
Refactor: Move recipients method into acts_as_event
...
acts_as_event should be the standard interface to Redmine events, like mail
notifications, so having a standard recipients implementation there makes sense.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3358 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-01 18:57:12 +00:00
1ba5779f94
Fixed: rubytree gem breaks db:migrate:plugins ( #4394 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 14:41:37 +00:00
6610bb6b6c
Moves watchers filtering logic to ActsAsWatchable.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3168 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 13:06:57 +00:00
Felix Schäfer
Jean-Philippe Lang
Tim Felgentreff
Eric Davis
Jean-Baptiste Barth
Holger Just
Holger Just