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

1173 Commits

Author SHA1 Message Date
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
Jean-Philippe Lang
6f841b7f43 Fixed: 'View difference' broken on wiki page history (#6747). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4372 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 13:22:23 +00:00
Tim Felgentreff
eb805ff3fd Merge remote branch 'edavis/master' into master-journalized 2010-11-05 18:50:09 +01:00
Eric Davis
c55e060bab Allow key authentication when deleting issues (with tests) #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4367 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-05 17:49:25 +00:00
Eric Davis
7d934c984a Allow key authentication when updating issues (with tests) #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-05 17:49:20 +00:00
Tim Felgentreff
cbf8bf1f8d make sure we have activity to find 2010-11-05 17:58:00 +01:00
Eric Davis
4b1dd334a5 Allow key authentication when creating issues (with tests) #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4365 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-05 16:29:56 +00:00
Tim Felgentreff
759313b181 more test fixes 2010-11-05 17:04:09 +01:00
Tim Felgentreff
4a2f5d37a0 fixin 2010-11-05 16:09:42 +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
65097e7d11 fixing tests 2010-11-05 11:46:03 +01:00
Tim Felgentreff
5dda7e34a3 test fixes 2010-11-05 11:20:58 +01:00
Tim Felgentreff
f0cd92c80c Merge remote branch 'edavis/master' into master-journalized 2010-11-05 10:00:23 +01:00
Eric Davis
c967899b14 Refactor: Convert the tests for Issues#index and #show APIs to shoulda. #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4364 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-04 16:22:47 +00:00
Tim Felgentreff
a2c7e73df4 adjust tests to fixtures 2010-11-03 18:42:42 +01:00
Tim Felgentreff
ea8b8c6548 update fixtures 2010-11-03 18:30:46 +01:00
Eric Davis
30dc4fec99 Refactor: convert API key tests using HTTP Basic to a shoulda macro 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4363 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-03 16:48:23 +00: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
Tim Felgentreff
d6013c62f7 fix a couple more tests 2010-11-03 15:58:28 +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
a04d64881c Refactor: convert username/password http basic auth api tests to shoulda macros #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4360 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-02 15:52:06 +00:00
Eric Davis
bed79f523b Refactor: convert api key tests to shoulda macros for reuse. #6447 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4358 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 15:45:03 +00:00
Eric Davis
d5fde17bf5 Move all API tests into the ApiTest module to make management easier 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4357 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 15:26:05 +00:00
Jean-Philippe Lang
db2ecd3010 Fixed: "Template is missing" error when validation fails on version edit (#6766). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4354 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 13:13:32 +00:00
Jean-Baptiste Barth
f8b79c52cb Force color to be disabled on git shell-outs. #5324 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4310 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-29 23:21:57 +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
Eric Davis
e9efa5b981 Refactor: use :id instead of :page when linking to Wiki Pages 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 16:27:06 +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
Eric Davis
70bf0706b2 Refactor: convert WikiController#destroy to use HTTP DELETE 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4295 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-26 15:59:20 +00:00
Eric Davis
397222f198 Allow adding notes when moving issues 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4292 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-25 18:44:46 +00:00
Eric Davis
22e3cba0b7 Allow changing the Priority when moving issues. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-25 18:44:41 +00:00
Eric Davis
4b045badcf Refactor: Rename WikiController#page_index to #index 
index is the action that should list a collection of records, which is
what #page_index does.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-25 16:16:46 +00:00
Eric Davis
0e951c0716 Fix the tests that were broken by r4286: 
"Refactor: merged error rendering methods."

http://ci.finn.de/builds/1-8-7_redmine-trunk_mysql/4286

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4289 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-25 15:42:41 +00: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
Jean-Philippe Lang
7824eca775 Refactor: merged error rendering methods. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-23 11:07:04 +00:00
Jean-Philippe Lang
eea456ed84 Improved error message when trying to access an archived project (#2995). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-23 09:48:01 +00:00
Jean-Philippe Lang
ed608cb7d3 Fixed: error on gantt when no issue have a due date (#6350). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4280 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 22:13:39 +00:00
Eric Davis
b1921830de Mark the failed test in r4276 as pending. Tests should never fail when committed. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4278 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 21:29:02 +00:00
Jean-Philippe Lang
d0bbe830ad Adds a failing test for #6350. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4276 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 20:32:05 +00:00
Jean-Philippe Lang
d9652183f6 Fixed: file upload on wiki page broken by recent refactoring (#6724). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4274 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 17:38:05 +00:00
Eric Davis
cac3b1e538 Refactor: split WikiController#edit into #update 
update will handle the saving and should be accessed via POST only.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4272 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-22 16:20:20 +00:00
Eric Davis
c259ada6e1 Refactor: rename WikiController#index to #show, it's a single resource action 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-21 16:07:28 +00:00
Eric Davis
d3381fb518 Refactor: change :id on WikiController to use :project_id 
Using :id to track projects on non-project controllers is confusing and
makes routing with resources difficult.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4265 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-20 21:26:30 +00:00