Commit Graph

739 Commits

Author SHA1 Message Date
Tim Felgentreff 4eb07d6ce6 fix use of versions vs journals 2010-09-14 15:18:28 +02:00
Tim Felgentreff a6a25cc5c1 render done_ratio as decimal 2010-09-14 15:17:51 +02:00
Tim Felgentreff 72e7baafdf fix various tests in mailer, wiki content and issue helper 2010-09-14 14:25:19 +02:00
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 597266e5a2 Merged r3929 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:36 +00:00
Eric Davis 36ad597b69 Merged r3928 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3978 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:31 +00:00
Eric Davis c67272599c Merged r3927 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:32:25 +00:00
Eric Davis 102e845391 Merged r3916 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:18 +00:00
Eric Davis acaa223cf8 Merged r3907 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:23 +00:00
Eric Davis 8dde6e019d Merged r3906 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:03 +00:00
Tim Felgentreff 331d98c2d2 fix first version for wiki 2010-08-10 17:09:28 +02:00
Wieland Lindenthal 08a013da44 Minor bug fixes to journalized versions 2010-08-10 16:18:26 +02:00
Tim Felgentreff 7d67365e10 smaller fixes for journalized news and attachments 2010-08-06 18:47:56 +02: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 81e97d23a8 fix document activity url 2010-08-04 19:02:49 +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 cea1a987ab fix display of attachments with acts_as_journalized 2010-08-04 18:56:33 +02:00
Tim Felgentreff d34abea14e use the journal formatters API to register the issue journal formats 2010-07-29 11:30:24 +02:00
Jean-Philippe Lang 52a12aaca8 Merged r3881 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 10:49:08 +00:00
Jean-Philippe Lang ec526c1261 Merged r3873 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3874 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:52:07 +00:00
Eric Davis 8a1d45ffd6 Merged r3860 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-24 00:20:35 +00:00
Tim Felgentreff 4851451017 remove changes from version model 2010-07-23 17:17:00 +02:00
Tim Felgentreff ff6372ad43 move wiki edits to use journalized plugin. will break if any actual edits are done 2010-07-21 18:25:01 +02:00
Tim Felgentreff ff31875149 move to STI for journals so the journals themselves can be events 2010-07-21 17:57:45 +02: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 4b0bd11f6d move more journal classes 2010-07-15 18:23:19 +02:00
Tim Felgentreff aecb868b85 remove more journal specific functionality 2010-07-14 19:00:03 +02:00
Tim Felgentreff d7768ce600 remove journals to start moving it all out to vestal_versions based plugin 2010-07-14 14:13:55 +02:00
Eric Davis 0d5fca9ba5 Force the default value of path to be set on the Change model class. #5771
This is needed because MySQL does not support default values on text columns
(Error introduced in r3828)

Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-06 21:06:09 +00:00
Eric Davis c6201ae15b Recalculate inherited attributes on parents when a child is moved under a new parent. #5524
Contributed by Jean-Baptiste Barth.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 02:45:34 +00:00
Holger Just f2957176bf Added helper functions to base journal class 2010-06-29 19:39:28 +02:00
Holger Just bcbb328cd2 Merge branch 'master' of git://github.com/edavis10/redmine into journals 2010-06-29 19:27:14 +02:00
Eric Davis 672852baaf Force string comparison for login search to be case sensitive on MySQL. #2473
Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-24 03:08:20 +00:00
Eric Davis 6cb4ff7d89 Refactor and documentation for User#find_by_login.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3808 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 21:40:55 +00:00
Eric Davis de17640489 Change User#login to be case-insensitive. #2473
This change also overrides User#find_by_login to give priority to exact
matches in the login.

Contributed by Greg Mefford

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 21:40:50 +00:00
Eric Davis 4083e7e622 Truncate incoming email subject lines to 255 characters. #5698
Contributed by Jan

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:22:36 +00:00
Eric Davis d48eb2de47 Accept email from anonymous users with an empty from address. #5604
Contributed by Andrew Fenn

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 19:24:17 +00:00
Eric Davis f08b2a394d Unused variable
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 03:54:28 +00:00
Eric Davis c56c0f411c Fix a nil error when a Project cannot save attachments.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 03:54:17 +00:00
Holger Just bc6805a6a6 Initial version of acts_as_journalized 2010-06-18 19:31:21 +02:00
Eric Davis e94c45d548 Add an "Assigned To" keyword to receiving email. #5594
Will take a user's email address, login, or full name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-29 00:05:24 +00:00
Eric Davis 080dc2212e Add 'Start date' and 'End date' keywords for incoming email. #5595
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-28 23:45:45 +00:00
Eric Davis 1a4b23731f Include the Project name when sorting versions.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 17:16:15 +00:00
Eric Davis f3cc84b343 Show subproject versions on the Roadmap.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 17:16:10 +00:00
Eric Davis 908d44519c Allow AuthSources to control if they allow password changes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:37 +00:00
Eric Davis a1f73c8b20 Remove hard coded LDAP log message.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-23 03:16:25 +00:00
Jean-Philippe Lang cbd4af236c Adds issue relations to individual issue XML (#5305).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3729 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-01 14:07:36 +00:00
Jean-Philippe Lang da7c89bfd0 Fixes workflow edit with JRuby (#5404).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 12:19:51 +00:00
Eric Davis 7ccdaee110 Only copy visible issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-29 23:26:52 +00:00