obsolete.ChilliProject/app/views
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
..
account Adds hooks on login view (#4978). 2010-03-03 20:21:05 +00:00
activities Refactor: extract ProjectsController#activity to a new Activities controller. 2010-08-27 14:05:54 +00:00
admin Refactor: move method to Project#css_classes 2010-09-10 23:07:10 +00:00
attachments Merged r3879 from trunk. 2010-07-25 10:35:35 +00:00
auth_sources Refactor AuthSourcesController to support non-LDAP sources. #1131 2010-05-23 03:16:31 +00:00
auto_completes Merged r3945 from trunk. 2010-08-19 04:34:08 +00:00
boards Refactor: extract ProjectsController#activity to a new Activities controller. 2010-08-27 14:05:54 +00:00
calendars Rename task to issue in calendar (#6563) 2010-10-07 15:26:53 +00:00
common Display the correct ISO week number on the project calendar. 2010-06-19 22:52:15 +00:00
context_menus Added ability to edit issues from different project through contextual menu (#5332) 2010-10-08 03:09:51 +00:00
custom_fields Replace the hardcoded CustomField::FIELD_FORMATS with a class. 2010-04-16 15:33:49 +00:00
documents Fixed: code syntax highlighting not working in Document page (#3740). 2010-03-18 20:06:16 +00:00
enumerations Adds missing thead tags (#5440). 2010-05-09 11:19:15 +00:00
files Refactor: convert FilesController to a restful resource. 2010-09-14 16:24:07 +00:00
gantts Fixes broken filter clearing links on gantt and calendar (#6473). 2010-09-26 07:51:10 +00:00
groups Adds missing thead tags (#5440). 2010-05-09 11:19:15 +00:00
issue_categories Moves ProjectsController#add_issue_category to IssueCategoriesController#new. 2010-03-06 18:43:00 +00:00
issue_moves Merged r3936 from trunk. 2010-08-19 04:33:18 +00:00
issue_relations Application layout refactored. 2007-09-22 13:17:49 +00:00
issue_statuses Adds an helper for displaying the 'checked' image. 2010-03-17 20:46:22 +00:00
issues Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
journals Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
layouts Merged r4005 from trunk. 2010-08-22 19:48:38 +00:00
ldap_auth_sources Refactor AuthSourcesController to support non-LDAP sources. #1131 2010-05-23 03:16:31 +00:00
mailer update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
members User groups branch merged. 2009-09-12 08:36:46 +00:00
messages Merged r3877 from trunk. 2010-07-25 10:02:55 +00:00
my Use HTTP DELETE when deleting a time entry. #6674 2010-10-15 23:37:01 +00:00
news Refactor: convert News to a REST resource 2010-09-27 16:51:12 +00:00
previews Merged r3946 from trunk. 2010-08-19 04:34:14 +00:00
projects Refactor: rename TimelogController#details to #index 2010-10-06 18:23:45 +00:00
queries Fixed: pressing enter in filters should result to an 'apply', not a 'save'. #2285 2010-09-16 21:33:49 +00:00
reports Added two hooks to the issues report. #5233 2010-06-20 03:37:42 +00:00
repositories Fixes switching between inline and side-by-side in diff view with path. #6242 2010-09-18 16:50:08 +00:00
roles Refactor: Merged RolesController#list and #index 2010-02-15 16:41:16 +00:00
search forgot a few versioned => journaled conversions 2010-09-15 11:05:42 +02:00
settings Changed the notifications to use a hierarchy UI 2010-09-28 21:09:06 +00:00
time_entry_reports Refactor: extract TimelogController#new from #edit 2010-10-07 15:51:09 +00:00
timelog Refactor: convert timelogs to a REST resource (:time_entries) 2010-10-12 15:55:21 +00:00
trackers Refactor: Merged TrackersController#list and #index 2010-02-15 16:41:27 +00:00
users Fixed bad markup in users/general partial 2010-10-11 20:34:33 +00:00
versions Adds a link to edit the associated wiki page on the version view. #4416 2010-09-18 17:30:22 +00:00
watchers Move issue watchers to the sidebar. 2010-03-13 17:45:41 +00:00
welcome Refactor: extract ProjectsController#activity to a new Activities controller. 2010-08-27 14:05:54 +00:00
wiki Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
wikis Added project module concept. 2007-09-14 11:34:08 +00:00
workflows Add "Check/Unckeck all" buttons to rows and columns on workflow edit screen (#3201). 2010-04-27 17:54:27 +00:00