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

3636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3e6d7637db update actsasjournalized 2010-11-03 18:51:49 +01: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
1569aae165 updated acts_as_journalized 2010-11-03 17:46:03 +01:00
Tim Felgentreff
90ba2d4bfb update xml builder to use the journals instead of journal details 2010-11-03 17:30:07 +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
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
Jean-Baptiste Barth
27049b848d Use File#expand_path for require's in script/* for Ruby 1.9.2 compatibility. #4050 
Since Ruby 1.9.2, LOAD_PATH does not include "." directory anymore, so
we should use absolute paths instead to ensure both 1.8.x and 1.9.x
compatibility. It has been included in railties 2.3.x branch since
july 2009, see 7a427a83ca

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4359 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-02 00:20:21 +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-Philippe Lang
ba56b3f763 Provides a default string for untranslated search types. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 12:55:15 +00:00
Eric Davis
b2eeeb6fa0 Bump version to 1.0.3 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4349 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 00:37:19 +00:00
Eric Davis
147a16cbf8 Update changelog for v1.0.3 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4348 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-01 00:37:14 +00:00
Jean-Baptiste Barth
7c5497db65 Add a label for user and group search fields. #6521 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4312 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-30 16:47:33 +00: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
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
Jean-Baptiste Barth
55cf64393d Fixed Redmine.pm not working with LDAPS on a non-standard port. #4065 
Contributed by Fabian Schlenz

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4309 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-29 22:55:50 +00:00
Jean-Baptiste Barth
31b9868fc1 Updated wiki-syntax help page to reflect new link options and last coderay upgrade. #5948 
Contributed by Holger Just and Mischa The Evil

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4308 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-29 22:48:59 +00:00
Jean-Baptiste Barth
c91ca4fcd9 Fix wikilinks in project > settings > versions and version view. #6435 #4416 
Contributed by Mischa The Evil and Felix Schäfer.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4307 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-29 22:40:02 +00:00
Jean-Baptiste Barth
1cf67b3a1d Fixed: disabling autologin not persisted. #6438 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4306 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-29 22:28:24 +00:00
Azamat Hackimov
5d6245b059 Translation update (zh-TW, #6765) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4305 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-28 21:58:58 +00:00
Azamat Hackimov
8dc0d4b916 Translation update (he, #6569) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4304 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-28 21:56:52 +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
Jean-Baptiste Barth
e7e7a91b85 Fixed potential nil method errors when trying to access /issues/context_menu with GET. #6750 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 21:01:26 +00:00
Azamat Hackimov
6ffcbaa7b3 Translation update (ru) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4301 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 18:58:36 +00:00
Azamat Hackimov
1b1a059d90 Fixing "Kilobyte" prefix to kB (#6740) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 18:46:20 +00:00
Azamat Hackimov
d41391e87a Readding string field_start_date (#6629) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4299 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 18:40:45 +00:00
Azamat Hackimov
8ebe03ef86 Translation update (de, #6607) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 18:29:30 +00:00
Azamat Hackimov
cc9d356a55 Translation updates 
* bg (#6669)
* ja (#6732)
* mk (#6731)
* sv (#6739)
* zh-TW (#6736)


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-27 18:20:55 +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
fe33a89c76 fix issue_test 2010-10-27 12:19:15 +02:00
Tim Felgentreff
9bb45d9e75 Fix journal_observer 2010-10-27 11:53:20 +02: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
17eab0f5f9 Fix wiki links on the activity page. #6746 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-26 15:44:30 +00:00
Eric Davis
c399e76324 Add Redmine::Plugin.installed?(:name) method to check if a plugin is installed 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4293 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-25 23:32:01 +00:00