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

507 Commits

Author SHA1 Message Date
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 2bea4b30a5 Merged r4028 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4031 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 21:21:20 +00:00
Eric Davis 0d7cead479 Merged r4013 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-22 19:49:26 +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 b9f23bedb7 Merged r3948 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3998 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:26 +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 bc57078b12 Merged r3944 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3994 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:34:02 +00:00
Eric Davis 1c93f99a55 Merged r3943 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3993 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:33:57 +00:00
Eric Davis 2012c60bfd Merged r3941 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:33:46 +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 a96eb375ec Merged r3925 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3975 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:32:13 +00:00
Eric Davis 31d233e567 Merged r3922 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3972 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:53 +00:00
Eric Davis 4ff6070126 Merged r3921 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3971 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:48 +00:00
Eric Davis dfe44017b6 Merged r3920 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:42 +00:00
Eric Davis 7cae43314a Merged r3919 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3969 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:31:36 +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 c20e85e4dd Merged r3909 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3959 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-19 04:30:35 +00:00
Tim Felgentreff 1f9eda4e0d update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
Tim Felgentreff 47ecf151dd completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized 
This makes the wiki just use the versioning provided by acts_as_journalized
 2010-08-04 19:01:18 +02:00
Tim Felgentreff 75024acf5a possibly use the activity permissions in the fetcher to find visible event types 2010-07-29 11:31:06 +02:00
Jean-Philippe Lang e771fc03bd Merged r3883, r3884 and r3885 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3886 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-25 11:49:07 +00:00
Eric Davis 4b52b7a8df Change version to the show this is the stable branch. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3857 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-18 16:39:00 +00:00
Eric Davis 6ed2e003a1 Merged r3854 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3856 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-18 16:38:56 +00:00
Eric Davis 5e259d41e2 Fix typos in the examples. #5823 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-16 03:11:35 +00:00
Tim Felgentreff 2ec2405b32 convert more to acts_as_journalized 2010-07-15 21:10:05 +02:00
Tim Felgentreff 2d282f8deb move (almost) everything over to acts_as_journalized 2010-07-15 18:24:12 +02:00
Tim Felgentreff aecb868b85 remove more journal specific functionality 2010-07-14 19:00:03 +02:00
Eric Davis a84ea6866d Version 0.9.6 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3836 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-08 03:53:07 +00:00
Eric Davis ad73f12a6b Include visible subprojects when checking for available Activity event types. #5589 
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-06 02:22:03 +00:00
Eric Davis 305cab100f Rename code and locale typo: Developper. #5751 
Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3820 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-30 01:55:44 +00:00
Eric Davis bc3ad9af38 Bump release to 0.9.5 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3815 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-28 02:46:25 +00:00
Eric Davis 6eea3300f8 Sanitize image links and handle nils in the toc formatter. #5445 
Based on contribution by Yuki Kita.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-24 02:35:24 +00:00
Eric Davis acef1d5352 Exclude fields_for in the TabularFormBuilder, it has a different method 
signature. #5416

Contributed by Jean-Baptiste Barth

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3804 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-20 19:03:09 +00:00
Eric Davis c5863c0ad0 Support listing directories in svn which include square brackets. #5548 
Contributed by Gregor Schmidt

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3800 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-20 16:08:26 +00:00
Eric Davis b53de502ab Display the link name when external links are used in the toc macro. #5445 
Contributed by Yuki Kita and Jean-Baptiste Barth

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-19 21:39:21 +00:00
Eric Davis 69d9600f48 Added documentation about the session_path. #3968 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3785 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-19 20:04:47 +00:00
Eric Davis 759858d11d Add example url and author url to the plugin generator. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-17 19:02:13 +00:00
Eric Davis 1a145dca25 Plugin models and controllers must be unloadable. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3770 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-17 19:02:07 +00:00
Eric Davis 36c82ecc1f Refactor: move Project Calendar to it's own controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3732 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-05-03 16:02:37 +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 6a8dc735d3 Fixes Bazaar adapter for JRuby/Win32 (#5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3723 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-05-01 09:56:59 +00:00
Jean-Philippe Lang b897089729 Fixes Mercurial adapter for JRuby (#4494, #5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3722 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-05-01 09:55:40 +00:00
Jean-Philippe Lang 4a4bc93278 Adds jdbc rake tasks (#5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3721 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-05-01 09:37:46 +00:00
Jean-Philippe Lang 0a47389a65 Fixes some textile issues with JRuby (#5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3718 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-30 17:50:34 +00:00
Jean-Philippe Lang f65c47e3a7 Fixes theme discovery under JRuby on Rails war structure (#632, #5404). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3710 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-30 12:44:19 +00:00
Eric Davis e65c3cfc7d Refactor: Move gantts to a separate controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3695 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-28 15:54:46 +00:00
Eric Davis 2c898d8a81 Refactor: Split IssuesController#new to #new and #create to match REST pattern. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3688 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-22 15:43:57 +00:00
Eric Davis 538642c5c4 Let custom field formats control how they are edited. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3675 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-16 15:34:05 +00:00
Eric Davis 4cb943571a Change the case statement into a method call based on the name 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3674 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-16 15:34:00 +00:00
Eric Davis d22723ed04 Refactor: Move method 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3673 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-04-16 15:33:55 +00:00