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

4852 Commits

Author SHA1 Message Date
Felix Schäfer 2ceffca3e3 Don't loose the time of the wiki_edits. #468 
Contributed by Artem Naluzhnyy.
 2011-06-16 21:01:38 +02:00
Felix Schäfer 85c3d38d24 Fix the wiki links in the activity view. #469 
Contributed by Artem Naluzhnyy.
 2011-06-16 20:56:48 +02:00
Felix Schäfer 9ce7fd4230 Merge pull request #76 from schmidt/b/477-rake-rdoctask 
Getting rid of "rake/rdoctask is deprecated." warning. #477
 2011-06-16 10:08:16 -07:00
Gregor Schmidt 2630a84e10 [#477] 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 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 [#350] 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 [#442] 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 [#453] 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 [#441] Journals should touch their journaled to update updated_on/at fields 2011-06-05 11:49:40 -07:00
Eric Davis 0f35c7d1c2 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:30:48 -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 [#445] 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 3a0a7d93b1 Merge branch 'release-v2.0.0' into unstable 
Merging during the release to make sure everything is passing in CI,
which isn't set up to test release branches.
 2011-06-03 11:09:06 -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 [#444] Remove extra variable 2011-06-03 10:50:16 -07:00
Eric Davis f518251d5f [#444] 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 (#5255). 
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
Toshi MARUYAMA 81bdbd77f7 scm: not use Iconv for log converting in Ruby 1.9 and fix tests fails in Ruby 1.9. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5367 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-06-03 10:11:49 -07:00
Eric Davis 7eb98dbd34 [#443] Fix failing tests on 1.9.2 due to an invalid fixture 2011-06-03 09:55:44 -07:00
Eric Davis 76c9a6682f Remove duplicated test 2011-06-03 09:15:46 -07:00
Eric Davis aa07982daa Fix an edge-edge case bug in journal_attributes_for_user with different users 
In one case in a plugin (not able to reproduce in core) journal_attributes_for_user
would set the :user to something different than what's in updated_by thus assigning
the Journal to the wrong user.
 2011-06-01 22:00:02 -07:00
Holger Just db3480bdb6 [#436] Fix test relying on trailing whitespace. 2011-05-31 09:59:19 +02:00
Eric Davis f0987c8238 [#437] Move the encoding to the top of pdf.rb for Ruby 1.9 2011-05-30 15:11:08 -07:00
Eric Davis a428fa6068 Bumping version to 2.0.0RC1 2011-05-30 14:22:31 -07:00
Eric Davis 821d9f5ca4 [#437] Move the encoding to the top of pdf.rb for Ruby 1.9 2011-05-30 14:20:20 -07:00
Eric Davis 790bb362c5 Fix the merge conflict from 6b8897db5f 2011-05-30 14:05:40 -07:00
Holger Just 6b8897db5f Merge branch 'unstable' into release-v2.0.0 2011-05-30 21:25:11 +02:00
Holger Just 12e29be604 Merge branch 'issues/unstable/436-trailing-whitespace' into unstable 2011-05-30 21:18:48 +02:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Holger Just b72785b274 [#436] Adapt rake task to also clean trailing whitespace 2011-05-30 20:49:58 +02:00
Holger Just 40ce66d05d [#197] Better regex and no trailing whitespace. 2011-05-30 19:58:54 +02:00
Eric Davis 37f6b75749 Added VERSION.special to handle special version releases (RC, distributions, etc) 2011-05-29 17:59:51 -07:00
Eric Davis e68a869d2d Update RUNNING_TESTS.rdoc to point to a wiki page 2011-05-29 17:42:49 -07:00
Eric Davis cfe2483e13 Update CHANGELOG for 2.0.0 2011-05-29 17:40:45 -07:00
Eric Davis ec3717e644 Merge branch 'ticket/unstable/197-copyright' into unstable 2011-05-29 13:44:34 -07:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis f18090891f [#197] Add a rake task to update the copyright in code files 2011-05-29 13:11:37 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00