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
..
environments	Add documentation about setting the log level. #6135	2010-09-26 16:54:38 +00:00
initializers	Workaround for i18n 0.4.x with the old style syntax. #6428 #5608	2010-09-26 17:13:52 +00:00
locales	Merge branch 'master' into master-journalized	2010-10-26 18:20:57 +02:00
additional_environment.rb.example	Allow a config/additional_environment.rb file to customize the Rails::Initializer.	2009-11-08 02:16:42 +00:00
boot.rb	Upgraded to Rails 2.3.4 (#3597)	2009-09-13 17:14:35 +00:00
database.yml.example	Cleanup and warning added in database.yml.database about the test database.	2010-03-12 13:48:14 +00:00
email.yml.example	Added some common example email configs to email.yml.example (#3120)	2010-02-18 05:20:52 +00:00
environment.rb	move (almost) everything over to acts_as_journalized	2010-07-15 18:24:12 +02:00
routes.rb	Refactor: change :id on WikiController to use :project_id	2010-10-20 21:26:30 +00:00
settings.yml	Add a default mail notification setting for new users	2010-09-28 18:36:50 +00:00