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
..
SVG	Fixes SVG lib for ruby1.9.	2009-11-07 10:40:54 +00:00
generators	Add example url and author url to the plugin generator.	2010-06-17 19:02:13 +00:00
redmine	Merge branch 'master' into master-journalized	2010-10-26 18:20:57 +02:00
tasks	Add rake task to send test email. (#6511)	2010-10-15 22:50:33 +00:00
ar_condition.rb	Activity enhancements:	2008-03-11 19:33:38 +00:00
diff.rb	Added branch and tag support to the git repository viewer. (#1406)	2009-08-15 22:41:40 +00:00
faster_csv.rb	Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV.	2009-11-04 13:22:26 +00:00
redcloth3.rb	Fixes some textile issues with JRuby (#5404).	2010-04-30 17:50:34 +00:00
redmine.rb	Merge branch 'master' into master-journalized	2010-10-26 18:20:57 +02:00
tabular_form_builder.rb	Exclude fields_for in the TabularFormBuilder, it has a different method	2010-06-20 19:03:09 +00:00