obsolete.ChilliProject/app/views/wiki
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
..
_content.rhtml Added wiki macros support. 2 builtin macros are defined: hello_world (sample macro that displays the arguments) and macro_list (display the list of installed macros). 2007-11-12 14:36:33 +00:00
_sidebar.rhtml Refactor: extract method from WikiController#special 2010-10-18 15:27:49 +00:00
annotate.rhtml Refactor: change :id on WikiController to use :project_id 2010-10-20 21:26:30 +00:00
date_index.html.erb Refactor: extract method from WikiController#special 2010-10-18 15:27:49 +00:00
destroy.rhtml Refactor: change :id on WikiController to use :project_id 2010-10-20 21:26:30 +00:00
diff.rhtml Remove edit link on wiki page diff (#4346). 2009-12-06 17:04:33 +00:00
edit.rhtml Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
export.rhtml Hide paragraph terminator at the end of headings on html export (#4194). 2009-11-11 11:10:03 +00:00
export_multiple.rhtml Hide paragraph terminator at the end of headings on html export (#4194). 2009-11-11 11:10:03 +00:00
history.rhtml Merge branch 'master' into master-journalized 2010-10-26 18:20:57 +02:00
page_index.html.erb Refactor: extract #page_index from WikiController#special 2010-10-15 15:36:10 +00:00
rename.rhtml Wiki page hierarchy (#528). Parent page can be assigned on Rename screen. 2008-07-26 11:46:24 +00:00
show.rhtml Adds a permission for exporting wiki pages. 2010-02-06 09:30:53 +00:00