115 Commits

Author SHA1 Message Date
Tim Felgentreff
3e6d7637db update actsasjournalized 2010-11-03 18:51:49 +01:00
Tim Felgentreff
1569aae165 updated acts_as_journalized 2010-11-03 17:46:03 +01:00
Tim Felgentreff
40494cbe6b test fixes 2010-11-03 16:23:11 +01:00
Tim Felgentreff
fe33a89c76 fix issue_test 2010-10-27 12:19:15 +02:00
Tim Felgentreff
9bb45d9e75 Fix journal_observer 2010-10-27 11:53:20 +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
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
Tim Felgentreff
f0c657448a Updated acts_as_journalized 2010-09-15 17:51:16 +02:00
Tim Felgentreff
bb37aa24dc Update acts_as_journalized 2010-09-15 16:40:59 +02:00
Tim Felgentreff
5af629f31f Update acts_as_journalized 2010-09-15 12:57:27 +02:00
Tim Felgentreff
aaecab6d7f use latest acts_as_journalized 2010-09-14 19:18:43 +02:00
Tim Felgentreff
2dd4e3d12d Update acts_as_journalized 2010-09-14 14:25:30 +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
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
Eric Davis
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
Jean-Baptiste Barth
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
Tim Felgentreff
bbd131ad8d Update acts_as_journalized 2010-08-10 17:12:28 +02:00
Tim Felgentreff
5844623031 add acts_as_journalized into a submodule 2010-08-10 12:36:45 +02:00
Tim Felgentreff
1f9eda4e0d update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
Tim Felgentreff
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
Tim Felgentreff
ff31875149 move to STI for journals so the journals themselves can be events 2010-07-21 17:57:45 +02:00
Tim Felgentreff
2287d7ce8c with acts_as_journalized activities only have to search the journal table 2010-07-21 12:27:48 +02:00
Tim Felgentreff
2d282f8deb move (almost) everything over to acts_as_journalized 2010-07-15 18:24:12 +02:00
Tim Felgentreff
d7768ce600 remove journals to start moving it all out to vestal_versions based plugin 2010-07-14 14:13:55 +02:00
Holger Just
bcbb328cd2 Merge branch 'master' of git://github.com/edavis10/redmine into journals 2010-06-29 19:27:14 +02:00
Eric Davis
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
Holger Just
bc6805a6a6 Initial version of acts_as_journalized 2010-06-18 19:31:21 +02:00
Jean-Philippe Lang
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
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Eric Davis
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
Eric Davis
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Eric Davis
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
Jean-Philippe Lang
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
Jean-Philippe Lang
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
Jean-Philippe Lang
e5dc94fe82 Make use of #watched_by? in issue form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3114 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-02 19:17:42 +00:00
Eric Davis
1f06cf8899 Converted Menus to a Tree structure to allow submenus.
* Bundle the rubytree gem
* Patched RubyTree's TreeNode to add some additional methods.
* Converted the menu rendering to walk the Tree of MenuItems to render
  each item
* Added a menu option for :parent_menu to make this menu a child of the parent
* Added a bunch of tests
* Made MenuItem a subclass of Tree::TreeNode in order to use it's methods
  directly
* Changed the exceptions in MenuItem#new to be ArgumentErrors instead of the
  generic RuntimeError

  #4250

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3090 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-25 05:36:44 +00:00
Jean-Philippe Lang
4e3202d2a2 Reverts r3014 (CodeRay back to 0.7.6).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3079 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-20 15:50:06 +00:00
Jean-Philippe Lang
be41f7f473 Upgrade Coderay to 0.9.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3014 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-07 09:08:13 +00:00
Jean-Philippe Lang
531eb65557 Fixes a wrong number of arguments error with ruby1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2911 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-10 15:04:08 +00:00
Eric Davis
bcbf08017a Upgrade the Engines plugin to get the bugfix for Rails::Plugin::GemLocator
This update will allow Rails Engines to be installed as gems.  For example:

    # config/environment.rb
    Rails::Initializer.run do |config|
      ...
      config.gem 'timesheet_plugin'
    end

Will load the timesheet_plugins's RubyGem and allow it to work as if it was
installed to vendor/plugins.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2904 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-07 16:43:50 +00:00
Eric Davis
7b0cb6aba8 Upgraded to Rails 2.3.4 (#3597)
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-13 17:14:35 +00:00
Eric Davis
560e915c50 Upgraded the gravatar plugin from http://github.com/woods/gravatar-plugin
This will update the gravatar.com url (#2921) and provide support for SSL
gravatars (#2718).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2832 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-02 04:19:44 +00:00
Jean-Philippe Lang
bb44430b63 Ask user what to do with child pages when deleting a parent wiki page (#3202).
3 options are available:
* move child pages as root pages
* move child pages to another parent page
* delete all descendants

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-21 12:19:56 +00:00
Jean-Philippe Lang
608d6683da Fixed broken OpenID authentication after migration to Rails 2.2 (#2894).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-04 17:37:28 +00:00