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

4770 Commits

Author SHA1 Message Date
Eric Davis
6017e2712e Add rescues to the aaj migrations for unsaved records. 
If the Journal or the Journaled object don't save successfully,
put out the reasons why instead of aborting the migrations. Journaled
objects might failure from the :touch update, which are safe to ignore.
 2011-07-01 15:16:07 -07:00
Eric Davis
32f92a5058 [] Ugly patch to stop creating journals when only line endings change 2011-07-01 12:25:07 -07:00
Eric Davis
66c4db8669 [] Escape AuthSources in the list. 
Contributed by MAEDA, Go
 2011-06-27 15:38:45 -07:00
Eric Davis
3e924ce6be Bump version to 2.0.0RC3 v2.0.0RC3 2011-06-17 15:25:11 -07:00
Eric Davis
cd121fe7af Update CHANGELOG for release 2011-06-17 15:24:33 -07:00
Eric Davis
9de3fcbc3f [] Remove FIXME, there is only one activity per Model 2011-06-17 14:48:13 -07:00
Eric Davis
c034d5e548 [] Remove helpers from IssuesController 2011-06-17 14:46:09 -07:00
Enderson Maia
713d0aea8c Better translation to keep a pattern in translations. 2011-06-17 14:43:55 -07:00
Eric Davis
8698b40974 Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0 2011-06-17 14:42:26 -07:00
Eric Davis
9f2c412fa6 [] Fix for undefined_method 'to_utf8' 
Contributed by Artem Naluzhnyy
 2011-06-17 14:36:46 -07:00
Eric Davis
7c751b350d Merge branch 'ticket/release-v2.0.0/474-changeset-journals' into release-v2.0.0 2011-06-17 13:06:30 -07:00
Eric Davis
2f3657502f [] aaj should use the Model's activity options for timestamp and author_key 
Some models (Changeset) require custom options passed to
acts_as_activity_provider but acts_as_journalized wasn't accepting these
for :timestamp or :author_key
 2011-06-17 12:39:07 -07:00
Eric Davis
1cf08ee300 [] Changesets should use the author method for events 
This will let them pick up the committer string if user is nil
 2011-06-17 12:29:04 -07:00
Eric Davis
3d164f1da0 [] Fix replying to IssueJournals through email 2011-06-17 12:10:23 -07:00
Eric Davis
0daa081d19 [] Set the activity_type on the initial journals 2011-06-17 10:50:11 -07:00
Eric Davis
67dbd0160d Document#category should be displayed as a required field 2011-06-17 10:25:56 -07:00
Eric Davis
2ff9711fc7 Migrate existing journals so version 1 is open for the initial journal 2011-06-17 10:18:56 -07:00
Eric Davis
8b13992c0a Print any errors when saving the initial journal instead of aborting 2011-06-17 10:09:10 -07:00
Eric Davis
52b83da8dd [] Split GeneralizeJournals into separate, incremental migrations 2011-06-17 09:49:24 -07:00
Eric Davis
498d3909cc Merge branch 'ticket/release-v2.0.0/467-journal-migration-sti-callback-bug' into release-v2.0.0 2011-06-17 09:42:03 -07:00
Eric Davis
47c7e0774a [] Fix bug with Journal subclasses having caches columns 2011-06-17 09:41:14 -07:00
Eric Davis
b52d2b2238 [] Fix uninitialized constant Journal::Journaled error 
Was due to Journals touching the parent record but the Journal
not having it's STI class correct during the type update.
 2011-06-17 09:13:05 -07:00
Felix Schäfer
0c03142832 Fix an apache perl module error. 
Contributed by Artem Naluzhnyy.
 2011-06-16 21:12:36 +02:00
Felix Schäfer
2ceffca3e3 Don't loose the time of the wiki_edits. 
Contributed by Artem Naluzhnyy.
 2011-06-16 21:01:38 +02:00
Felix Schäfer
85c3d38d24 Fix the wiki links in the activity view. 
Contributed by Artem Naluzhnyy.
 2011-06-16 20:56:48 +02:00
Felix Schäfer
9ce7fd4230 Merge pull request from schmidt/b/477-rake-rdoctask 
Getting rid of "rake/rdoctask is deprecated." warning.
2011-06-16 10:08:16 -07:00
Gregor Schmidt
2630a84e10 [] Not using deprecated rake/rdoctask but rdoc/task instead 
works with all rdoc versions since 2.4.2
see https://github.com/rdoc/rdoc/blob/master/History.txt
 2011-06-16 11:29:25 +02:00
Eric Davis
9ccb172c81 Bump version to 2.0.0RC2 v2.0.0RC2 2011-06-10 13:35:12 -07:00
Eric Davis
3112062bde Update CHANGELOG for 2.0.0RC2 2011-06-10 13:20:46 -07:00
Eric Davis
3c53d1a63c Added rake release[version] task based on the release process 
https://www.chiliproject.org/projects/chiliproject/wiki/HowTo_Release
 2011-06-10 13:15:52 -07:00
Rodrigo Rosenfeld Rosas
80c9df5e6b Update pt-BR translations 2011-06-10 13:03:54 -07:00
Eric Davis
a99ccc5d7c Merge remote-tracking branch 'schmidt/f/419-update-js-libs/unstable' into release-v2.0.0 2011-06-10 12:58:25 -07:00
Eric Davis
f47821db0c [] Remove freeze from Settings so the values can be modified later 2011-06-10 11:44:44 -07:00
Eric Davis
ee9b129382 Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0 
Conflicts:
	test/unit/journal_test.rb
 2011-06-10 11:41:52 -07:00
Eric Davis
1e68bed997 [] Handle nil changes in Atom feed 2011-06-10 11:21:07 -07:00
Eric Davis
e7883b876a Merge branch 'ticket/release-v2.0.0/445-initial-journal-tracking' into release-v2.0.0 2011-06-10 10:45:48 -07:00
Eric Davis
731de487e4 [] Upgrade to Rails 2.3.12 2011-06-10 10:43:12 -07:00
Eric Davis
95b19953a4 Add plugin hooks to Users#show view 2011-06-07 14:51:19 -07:00
Eric Davis
bfba5e2151 [] Journals should touch their journaled to update updated_on/at fields 2011-06-05 11:49:40 -07:00
Eric Davis
85c7cfd0a7 Fix test on 1.9.2 postgres. 
Multiple records were found and postgres was returning them in a different
order than what the test assumed.
 2011-06-03 14:11:08 -07:00
Eric Davis
33e3a71341 [] Track initial object attributes on the initial journal 
So the initial journal would have the changes from an Object#new
to the created version of the Object. Also includes a change to the
database migration in order to create these initial journals for
all journaled Objects.
 2011-06-03 13:01:56 -07:00
Eric Davis
3b64c60bc0 Merge branch 'ticket/release-v2.0.0/444-scm-encoding' into release-v2.0.0 2011-06-03 11:01:21 -07:00
Eric Davis
ba3ddee99d [] Remove extra variable 2011-06-03 10:50:16 -07:00
Eric Davis
f518251d5f [] Fix Changeset#to_utf8 coding standards 2011-06-03 10:46:46 -07:00
Jean-Philippe Lang
0f7ae9b658 Fixed: Update of Subversion changesets broken by r3466 under Solaris (). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:15:13 -07:00
Toshi MARUYAMA
6efba7b05d scm: use upcase to compare encoding name "UTF-8" in log converting. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5375 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:14:05 -07:00
Toshi MARUYAMA
e19c56d61a scm: replace invalid utf-8 sequences in comments instead of stripping on Ruby 1.8. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5373 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:13:48 -07:00
Toshi MARUYAMA
0adf1a87b1 scm: code clean up app/models/changeset.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5371 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:12:38 -07:00
Toshi MARUYAMA
5511155674 scm: fix log converting error in Ruby 1.9 and add more tests. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5370 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:12:23 -07:00
Toshi MARUYAMA
60b34ea29b scm: set empty log encoding UTF-8 in Ruby 1.9 and add tests. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5368 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:12:09 -07:00