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

856 Commits

Author SHA1 Message Date
Jean-Philippe Lang
3c1576e364 Manually require i18n 0.4.2 before Rails tries to load the most recent gem (#7013). 
This workaround makes Redmine work even if i18n 0.5.0 gem is installed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4516 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-17 08:34:29 +00:00
Jean-Philippe Lang
b48291ec63 Adds an application setting to limit the number of items that can be displayed on the gantt chart (#6276). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-15 21:18:06 +00:00
Jean-Baptiste Barth
9ac043a096 Set encoding to utf-8 for ruby 1.9 compatibility. #4050 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4510 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 23:24:45 +00:00
Jean-Baptiste Barth
17f86d964f Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 23:24:34 +00:00
Jean-Philippe Lang
e120f2aab4 Fixes tests after fixtures changes. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4507 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 19:43:15 +00:00
Jean-Philippe Lang
e4f319fe61 Validates user's mail_notification and turn options into strings (the attribute type). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4494 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 14:02:39 +00:00
Jean-Philippe Lang
3409333522 Makes issue safe_attributes extensible (#6000). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4491 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-12 13:11:53 +00:00
Jean-Philippe Lang
8407db9854 Fixes Changeset#text_tag for numeric scmid (#6681). 
Contributed by Toshi MARUYAMA.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4490 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-11 14:20:04 +00:00
Jean-Philippe Lang
8524d505c5 Add tests for wiki edit notifications (#7024). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4479 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-07 22:07:55 +00:00
Jean-Philippe Lang
b898200803 Select projects with issue_tracking module for gantt display and remove the nil start/due dates trick. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4477 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-07 19:42:36 +00:00
Jean-Philippe Lang
d7c607fd8b Automatic spent time logging from commit messages (#4155). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4470 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-05 11:45:09 +00:00
Jean-Philippe Lang
8841ba97c6 Fixed: class attribute with spaces on pre tags truncated (#7033). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-05 10:09:18 +00:00
Jean-Philippe Lang
7fb0fe2e91 Safer code in IssueRelation (#7018). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4467 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 18:10:02 +00:00
Jean-Philippe Lang
88e593ee02 Fixes unhandled case in json builder. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4464 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 11:20:20 +00:00
Jean-Philippe Lang
558a951ed6 Fixes unhandled case in json builder. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 10:41:31 +00:00
Jean-Philippe Lang
9284a32c9a Moves project attributes default assignments from ProjectsController#new to the model (#6064). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4460 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-03 16:15:16 +00:00
Jean-Philippe Lang
f6c633212a Prevents random failure in XmlTest. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4459 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-03 14:09:33 +00:00
Jean-Philippe Lang
735a83c596 Converts IssuesController to use the new API template system and makes xml/json responses consistent (#6136). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4458 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-03 13:52:07 +00:00
Jean-Philippe Lang
96ce0f017c Adds a builder-like template system for rendering xml and json API responses. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4452 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-03 11:25:21 +00:00
Jean-Philippe Lang
620c48fbbb Reload themes so that new themes can be used without restarting Redmine (#5712). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-27 14:06:11 +00:00
Jean-Philippe Lang
4faca3cd4a Fixed: messages attachments/watchers are not deleted when deleting a project or forum (#6966). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-27 12:42:11 +00:00
Jean-Philippe Lang
97140f6a78 Fixed: Wiki#find_page should not be case sensitive because page title uniqueness is not (#6987). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-27 11:14:28 +00:00
Jean-Philippe Lang
cfc3ee4f5a Fixed: r4417 breaks MercurialAdapter with ruby 1.8.6 (#5117). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-21 14:25:26 +00:00
Jean-Philippe Lang
6b72c66893 Fixed: MercurialAdapter.client_version depends on LANG environment variable (#5117). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4417 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-20 14:04:22 +00:00
Jean-Philippe Lang
1f237388bd Add assertions for #6929 in MailHandler tests. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4416 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-20 10:35:05 +00:00
Jean-Philippe Lang
ee91e34096 Fixes a NoMethodError in tests with ruby 1.8.6. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4408 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-14 16:51:10 +00:00
Jean-Philippe Lang
d7cdd58db6 MailHandler: ignore assignee if invalid. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4404 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-14 13:48:01 +00:00
Jean-Philippe Lang
abf988ad69 Makes MailHandler ignore invalid keyword values to avoid validation failures. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-12 13:08:32 +00:00
Jean-Philippe Lang
d4ab2ab4b9 Makes MailHandler accept localized keywords for default or user language (#6112). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-12 12:29:35 +00:00
Jean-Philippe Lang
e0e8c14c2a Makes MailHandler accept all issue attributes and custom fields that can be set/updated (#4071, #4807, #5622, #6110). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4394 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-12 11:34:53 +00:00
Jean-Philippe Lang
fa3d71bed9 Allow non-unique names for projects (#630). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4391 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-11 13:39:14 +00:00
Jean-Philippe Lang
44c9ad687f Reverted r4381. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4388 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-07 22:38:10 +00:00
Jean-Philippe Lang
3b01ea9fa4 Removed gantt and calendar menu items that do not fit into the core project menu (#6271). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-07 12:53:45 +00:00
Jean-Philippe Lang
7f9d2b0804 Render TOC as nested lists (#1857). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4377 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 18:52:07 +00:00
Jean-Philippe Lang
024ff96ee2 Extract headings and TOC parsing from the textile formatter. 
Fixes #2038 and #3707 and will allow to support TOC with other text formatters.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 17:47:27 +00:00
Jean-Philippe Lang
f79a6f701a Makes textile formatter accept 2 letters acronym (#6591). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 13:29:23 +00:00
Tim Felgentreff
cbf8bf1f8d make sure we have activity to find 2010-11-05 17:58:00 +01:00
Tim Felgentreff
66b7378306 fix journal test 2010-11-05 14:14:00 +01:00
Tim Felgentreff
445391f863 fix journal observer test 2010-11-05 14:12:11 +01:00
Tim Felgentreff
40494cbe6b test fixes 2010-11-03 16:23:11 +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
Eric Davis
7e359d3d7e Add a Email Header setting. Useful for adding delimiters to every email. 
#2852 #6628

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-02 19:00:36 +00:00
Eric Davis
0395eb99de Remove email quotes (>) when searching for incoming email delimiters. #2852 #6628 
Changes the email truncation so a delimiter can be prefixed by email
quotes or spaces ("> Eric said...").  This will let it be combined with
a "--- Reply above ---" delimiter to match "> --- Reply above ---"

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-02 19:00:31 +00:00
Eric Davis
c514dd6885 Refactor: convert WikiController to a REST resource 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-28 21:25:38 +00:00
Tim Felgentreff
1a2aa363bd fix journal observer tests, remove journal observer 2010-10-27 11:42:15 +02:00
Tim Felgentreff
8c5312e0ec more merge fixups 2010-10-26 18:58:54 +02:00
Tim Felgentreff
5310327c8a fix merge f*ckup 2010-10-26 18:46:16 +02: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
Jean-Baptiste Barth
d642964035 Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-23 22:35:02 +00:00