Commit Graph

29 Commits

Author SHA1 Message Date
Felix Schäfer 79ed4920cf Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable 2011-05-21 02:03:10 +02:00
Felix Schäfer 6f809b826e Replace a call to changes with its code from AR::Dirty. #422
acts_as_journalized called changes as per ActiveRecord::Dirty 
(see http://ar.rubyonrails.org/classes/ActiveRecord/Dirty.html#M000291), 
the journalized model Changeset :has_many changes though, which 
made the call return a list of associated objects instead of the 
intended list of changed attributes. Replaced changes with the code
from AR::Dirty to work around that.
2011-05-21 02:02:52 +02:00
Felix Schäfer 66561031eb [#400] Fix the event types (icons on activity and search views). 2011-05-20 13:51:51 -07:00
Gregor Schmidt 09fd71232e [#412] fixes to make tests run on 1.9.2 2011-05-13 23:52:24 +02:00
Eric Davis 193b2c7a38 [#404] Move vendor/plugins/acts_as_journalized/app/ to the core app/ 2011-05-13 12:34:24 -07:00
Eric Davis adf57a64f1 [#123] Move aaj migrations to core 2011-05-13 11:11:41 -07:00
Eric Davis 23ef9fedef [#123] Port the send_notification feature to aaj 2011-05-13 10:56:22 -07:00
Eric Davis 0ca73a7f69 [#123] Fix the down migration for Journal#journalized_type 2011-05-13 10:20:34 -07:00
Eric Davis b1845fcfeb [#123] Added latest edavis10:acts_as_journalized 2011-05-13 09:55:55 -07:00
Eric Davis 62c9fd2185 [#123] Removed the acts_as_journalized submodule 2011-05-13 09:49:56 -07:00
Felix Schäfer 9ca203beae Update to latest version of acts_as_journalized. 2011-04-21 11:44:16 +02:00
Tim Felgentreff 77b0a56768 update to incorporate latest acts_as_journalized fixes 2010-11-05 19:53:35 +01:00
Tim Felgentreff 905ac8c1e6 update to incorporate latest acts_as_journalized fixes 2010-11-05 19:48:50 +01:00
Tim Felgentreff 0d33f6c01a update to latest acts_as_journalized plugin 2010-11-05 18:41:37 +01:00
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
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 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 d7768ce600 remove journals to start moving it all out to vestal_versions based plugin 2010-07-14 14:13:55 +02:00
Holger Just bc6805a6a6 Initial version of acts_as_journalized 2010-06-18 19:31:21 +02:00