kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,629 Commits 5 Branches 46 Tags
Commit Graph

364 Commits

Author SHA1 Message Date
Tim Felgentreff
90ba2d4bfb update xml builder to use the journals instead of journal details 2010-11-03 17:30:07 +01:00
Tim Felgentreff
859bfa625d Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized 
Conflicts:
	app/models/wiki_content.rb
	app/views/wiki/history.rhtml
	config/locales/bg.yml
	config/locales/ca.yml
	config/locales/de.yml
	test/integration/api_test/projects_test.rb
 2010-11-03 16:03:39 +01:00
Jean-Baptiste Barth
abb83f4c4f Added ability to create issue directly as a subtask of another one. #5484 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4311 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-30 16:15:31 +00:00
Tim Felgentreff
19c7dc0094 Merge remote branch 'edavis/master' into master-journalized 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb
 2010-10-26 18:28:39 +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
Eric Davis
dc26fd215b Add ids to some sections of the issue form 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4275 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 18:20:00 +00:00
Jean-Philippe Lang
c058bc2245 Remove the Description label from the issue view and omit the block if empty (#6677). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4264 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-19 19:26:07 +00:00
Eric Davis
c8177b99ed Revert part of r3936. 
link_to_if_authorized no longer supports paths for the link options.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-15 23:11:05 +00:00
Eric Davis
84ebd786d6 Fix the Log Time link on an issue page 
Contributed by Philippe Lafoucrière (gravis)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 15:01:20 +00:00
Jean-Baptiste Barth
156eca4d22 Added ability to edit issues from different project through contextual menu (#5332) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 03:09:51 +00:00
Eric Davis
2ecca7e4df Refactor: rename TimelogController#details to #index 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-06 18:23:45 +00:00
Eric Davis
a09a39402e Add view_issues_form_details_top hook 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4165 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 18:50:09 +00:00
Eric Davis
f62a1827f3 Updated issue delete confirmation when it has child issues. #6191 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-20 02:55:26 +00:00
Jean-Baptiste Barth
35dba0f412 Fixed: pressing enter in filters should result to an 'apply', not a 'save'. #2285 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4093 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-16 21:33:49 +00:00
Eric Davis
969bf2107b Refactor: split VersionsController#new into #new and #create 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4090 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-16 18:27:33 +00:00
Eric Davis
bde8ab84f2 Use the full path to the partials 
When trying to use the issue form in a plugin, it would try to use the
relative path to the partials which were incorrect.

  Example: would render 'my_plugin_views/attributes'

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4089 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-15 22:43:30 +00:00
Tim Felgentreff
68ae2d0dfd change issue specific journal query and show_details for journal helper 2010-09-15 12:56:33 +02:00
Tim Felgentreff
9cd55d8dd4 more test fixes 2010-09-14 18:07:38 +02:00
Tim Felgentreff
4b098d7774 Merge branch 'journals' into 1.0-stable 
Conflicts:
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/helpers/journals_helper.rb
	app/views/issues/_history.rhtml
	lib/redmine/activity/fetcher.rb
	test/functional/issues_controller_test.rb
	test/test_helper.rb
 2010-09-14 09:32:35 +02:00
Eric Davis
270b559d36 Refocus the related issue field after submitting an issue. #6275 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4065 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-06 00:48:44 +00:00
Eric Davis
db11030410 Refactor: move method to model. (references r4057) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4062 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-05 22:57:20 +00:00
Jean-Baptiste Barth
b6d9f2bddf Add css classes to journals display to facilitate theming 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-03 20:05:51 +00:00
Jean-Baptiste Barth
4776a5a427 Hide checkboxes in issues list when printing 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4056 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-03 19:59:49 +00:00
Eric Davis
80256cf298 Refactor: extract #bulk_update method from IssuesController#bulk_edit. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4037 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-24 15:27:12 +00:00
Eric Davis
b67b3820a1 Refactor: move IssuesController#changes to JournalsController#index. 
Since #changes is only an Atom feed of journals of a query, it makes
more sense to have it on the JournalsController resource.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4034 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-23 15:04:36 +00:00
Eric Davis
c8c4fb130c Merged r4014 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4026 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:49:31 +00:00
Eric Davis
b5d64b9a2f Merged r4012 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4024 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:49:19 +00:00
Eric Davis
519069b867 Merged r4011 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4023 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:49:14 +00:00
Eric Davis
27ef72c35e Merged r4006 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4018 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:48:45 +00:00
Eric Davis
05527be943 Add RTL support to the context menu. #6012 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4014 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:12:21 +00:00
Eric Davis
7e565eed34 Fix the calendar link in the Issues sidebar. #5591 
Contributed by Andrew Rudenko

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 18:30:26 +00:00
Eric Davis
dfd1d0c7fe Refactor: merge IssuesController#update_form into IssuesController#new 
The #update_form action was only refreshing the issue attributes form,
so it's just a specialized JavaScript version of #new.  This also removed
old code that was extracted in other places (@issue.new_statuses_allowed_to).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4011 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-20 15:22:19 +00:00
Eric Davis
1fcc1bdc89 Refactor: move IssuesController#context_menu to a new controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 18:16:54 +00:00
Eric Davis
80e833cd88 Merged r3946 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3996 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:14 +00:00
Eric Davis
a12a073a6e Merged r3945 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3995 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:08 +00:00
Eric Davis
fab5064643 Merged r3936 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:33:18 +00:00
Eric Davis
c7e719fc4b Merged r3924 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3974 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:32:06 +00:00
Eric Davis
2f529fd834 Merged r3918 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3968 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:30 +00:00
Eric Davis
7bdf0ab729 Merged r3915 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3965 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:12 +00:00
Eric Davis
1f8d396e3f Refactor: move IssuesController#preview to a new controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-18 15:01:35 +00:00
Eric Davis
3eff27344b Refactor: move IssuesController#auto_complete to a new controller. #4382 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-17 15:03:58 +00:00
Eric Davis
ff43bb1a74 Refactor: Extract a new IssueMovesController from IssuesController. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3936 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-11 14:42:10 +00:00
Jean-Baptiste Barth
a1b607480a Refactor: added link_to_project helper to handle links to projects 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3924 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-08 07:07:20 +00:00
Eric Davis
041bca6ac9 Refactor: start to split IssuesController#move into two separate actions. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3918 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-06 15:47:27 +00:00
Jean-Baptiste Barth
8a2bc5772e Focus on the input when adding a related issue on issues/show page. #4656 
Contributed by Edouard Briere

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3915 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-04 20:52:31 +00:00
Eric Davis
df120e43cd Merged r3898 from trunk 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3901 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-30 19:20:52 +00:00
Azamat Hackimov
dbb8645353 RTL theme for reference (thanks to Orgad Shaneh, #5972) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3898 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-29 15:48:53 +00:00
Tim Felgentreff
f45bb1e85e use the render_journal API to pass Issue note editing permissions 2010-07-29 14:48:47 +02:00
Jean-Philippe Lang
f682be8468 Merged r3887 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3888 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-25 11:56:45 +00:00
Jean-Philippe Lang
e1c3415795 Fixes context menu broken by r3869 (#5925). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3887 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-25 11:55:57 +00:00