Commit Graph

102 Commits

Author SHA1 Message Date
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 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
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 432b00df40 Add documentation about contributing to Redmine with git
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 17:18:11 +00:00
Eric Davis d3517e87e5 Update changelog for the 1.0.2 release
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 22:39:44 +00:00
Eric Davis 29f9f3feff Merged r4029 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4032 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:21:25 +00:00
Eric Davis 00b53286fd Merged changelog from trunk, r4027.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4030 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:21:15 +00:00
Eric Davis 5b4bd8a59a Sure hope 1.0.1 wasn't released in 201,008 AD...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4029 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:17:44 +00:00
Eric Davis dcd2204786 Updated changelog for 1.0.1
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 21:15:33 +00:00
Eric Davis 18d841553e Merged r3923 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3973 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:59 +00:00
Eric Davis 5b64f0ff96 Updated changelog format to use lists.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3923 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-07 15:11:31 +00:00
Eric Davis 1cc116fe5c Merged r3853 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 16:38:51 +00:00
Eric Davis 854ba2a8d2 Adding 1.0.0's release date.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 16:35:37 +00:00
Eric Davis 0ae9cc7d07 Merged r3848 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 15:53:51 +00:00
Eric Davis 6807d070da Updated the INSTALL and UPGRADING documents for the 1.0 release.
Contributed by Mischa The Evil

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 15:19:04 +00:00
Eric Davis d064f27271 Updating CHANGELOG for 1.0
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-16 03:25:03 +00:00
Eric Davis 83f1ecb980 Update the CHANGELOG for 0.9.6
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3835 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-08 03:53:01 +00:00
Eric Davis c7d075fb68 Updating documentation for the 0.9.5 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3814 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-28 02:46:20 +00:00
Jean-Philippe Lang a499efd328 Updates for 0.9.4 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 12:37:20 +00:00
Jean-Philippe Lang 2af97616f7 Adds context menu to the roadmap issue lists.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-06 18:03:25 +00:00
Jean-Philippe Lang 049f47eaf0 Update for 0.9.3 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3506 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 10:20:40 +00:00
Jean-Philippe Lang d46609f4bb Fixes INSTALL and UPGRADING steps order (#4848).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3455 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-19 18:52:34 +00:00
Eric Davis 7b6b147761 Added some tests for the LDAP authentication.
Includes an export of an LDAP database to use in testing.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3438 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-16 16:40:50 +00:00
Jean-Philippe Lang 7059d0b500 Adds requirement for ruby version and tells that Rails is included in downloadable releases (#4836).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3423 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-13 13:35:39 +00:00
Jean-Philippe Lang be2004e398 Update for 0.9.2 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3392 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-07 12:47:53 +00:00
Jean-Philippe Lang 2261ec7b95 Updates for 0.9.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3348 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-30 10:53:35 +00:00
Jean-Philippe Lang ee64310df4 CHANGELOG updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-10 10:20:46 +00:00
Jean-Philippe Lang 7b99adb3d6 CHANGELOG updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3301 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-10 10:19:41 +00:00
Jean-Philippe Lang 90c0e99d2a CHANGELOG update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3295 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-09 11:49:45 +00:00
Jean-Philippe Lang 486f705494 Updated doc.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3293 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-09 11:46:53 +00:00
Jean-Philippe Lang 1052658df2 Merged 0.8.x changelog.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3243 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-26 10:21:05 +00:00
Jean-Philippe Lang e4d06246cd Set version to 0.9.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3233 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-23 20:47:10 +00:00
Jean-Philippe Lang d4ccce3c72 Development database required for running rake test (closes #4153).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-08 13:15:59 +00:00
Eric Davis 4425acafff Setup shoulda for testing. (#4005)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-17 20:37:23 +00:00
Eric Davis 40a039ce1c Updated INSTALL doc for Rails 2.2.2
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-19 03:34:45 +00:00
Jean-Philippe Lang 95ba220b79 Adds rake config/initializers/session_store.rb to the install doc.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2496 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 11:13:37 +00:00
Jean-Philippe Lang 13e2c727cf Updates 0.8.1 CHANGELOG.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2468 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-15 09:02:41 +00:00
Eric Davis 17d455c72f Codified instructions from RUNNING_TESTS as rake tasks for convenience
Rake tasks are in testing.rake and can be run by `rake test:scm:setup:<scm>`
Updated RUNNING_TESTS

Contributed by Gerrit Kaiser


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2260 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-12 04:44:01 +00:00
Jean-Philippe Lang 0819f00380 CHANGELOG updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2208 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-30 13:32:14 +00:00
Jean-Philippe Lang 2e8a0bd562 CHANGELOG updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2201 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-29 16:08:31 +00:00
Jean-Philippe Lang 3de4a1d788 CHANGELOG updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-19 14:13:24 +00:00
Jean-Philippe Lang e93d02d228 UPGRADING updated
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 09:59:19 +00:00
Jean-Philippe Lang d9714bff32 Update changelog for 0.8 rc1
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2104 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 09:56:28 +00:00
Jean-Philippe Lang 70fa891d48 Changelog updated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2100 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 08:41:54 +00:00
Eric Davis 0092a54e3b Slight non-code change to test git sync
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1920 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-30 00:02:46 +00:00
Eric Davis 1ffa468240 Reverting slight non-code change
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-29 23:56:35 +00:00
Eric Davis ae0ed7fd05 Slight non-code change
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1918 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-29 23:55:11 +00:00
Jean-Philippe Lang d93f96765b Adds support for file viewing with Darcs 2.0+ (patch #1799 by Ralph Lange slightly edited).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-25 14:33:30 +00:00
Eric Davis ca2449d9cf Added missing documentation for setting up the Darcs test repository.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-13 03:54:54 +00:00