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

2714 Commits

Author SHA1 Message Date
Holger Just 63d8264320 Make links in exported wiki HTML files absolute 2011-07-08 21:18:47 +02:00
Eric Davis 30bcd6c66b Merge branch 'master' into release-v2.0.0 
Conflicts:
	doc/CHANGELOG.rdoc
	lib/redmine/version.rb
 2011-07-01 21:46:38 -07:00
Eric Davis 32f92a5058 [#501] Ugly patch to stop creating journals when only line endings change 2011-07-01 12:25:07 -07:00
Eric Davis 66c4db8669 [#490] Escape AuthSources in the list. 
Contributed by MAEDA, Go
 2011-06-27 15:38:45 -07:00
Eric Davis a75eab1adb [#490] Escape AuthSources in the list. 
Contributed by MAEDA, Go
 2011-06-27 15:20:15 -07:00
Tom Kersten ffc1db8a54 Added hook for additional wiki formats [refs #488] 
* Allows plugins to add to the list of supported export formats at the
  bottom of the Wiki#show view template
 2011-06-20 22:32:47 -05:00
Eric Davis c034d5e548 [#398] Remove helpers from IssuesController 2011-06-17 14:46:09 -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 [#383] Fix for undefined_method 'to_utf8' 
Contributed by Artem Naluzhnyy
 2011-06-17 14:36:46 -07:00
Eric Davis 1cf08ee300 [#474] 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 [#480] Fix replying to IssueJournals through email 2011-06-17 12:10:23 -07:00
Eric Davis 67dbd0160d Document#category should be displayed as a required field 2011-06-17 10:25:56 -07: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
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 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 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
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis a85b6780d2 [#262] Convert line endings to UNIX 2011-05-29 12:00:18 -07:00
Eric Davis 5a9ffe9627 Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable 2011-05-27 15:00:08 -07:00
Eric Davis e4fac8d40f [#350] Refactor: extract method 2011-05-27 14:59:42 -07:00
Eric Davis b95c526151 Fix failing test: RepositoryMercurialTest#test_activities 2011-05-27 14:08:18 -07:00
Eric Davis cd64d11e17 Merge branch 'master' into unstable 
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
 2011-05-27 12:20:04 -07:00
Eric Davis 46f66add1f Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable 2011-05-27 10:42:53 -07:00
Tom Kersten ce8bb652c6 [#423] Removed explicit render in WikiController#show 
* Allows for format extensions in plugins w/o giving a double-render
  error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
  (vs. just 'sidebar')
 2011-05-27 10:20:45 -07:00
Felix Schäfer c51a32ac23 Use Rails.cache to cache application settings. #350 2011-05-25 17:11:16 +02:00
Felix Schäfer 5c8e04db55 Fix SearchController tests. 
The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).
 2011-05-25 16:40:34 +02:00
Eric Davis 8994a0b58d [#406] Added missing and removed unused code for Journals 
acts_as_journalized changed the interfaces and didn't include all of
the recent changes to the Journals system.

* removed Journal diffs, acts_as_journalized handles them differently
* fixed the Journal atom feed
* added the journal preview back in
* added missing tests
 2011-05-20 15:37:53 -07:00
Eric Davis a4f7629f1f [#400] Fix some tests broken by 6656103 2011-05-20 14:22:55 -07:00
Felix Schäfer 66561031eb [#400] Fix the event types (icons on activity and search views). 2011-05-20 13:51:51 -07:00
Felix Schäfer cf0804259d Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable 2011-05-20 15:45:54 +02:00
Felix Schäfer dbc10d2730 Save the comments to wiki page updates correctly. #415 2011-05-20 15:44:47 +02:00
Felix Schäfer 6598a44ddd Add a helper to format user lists. #304 2011-05-19 23:48:02 +02:00
Gregor Schmidt 3893ef9f7d [#416] updating watcher_tag in news/show to use watcher_link 2011-05-17 20:22:05 +02:00
Gregor Schmidt 4fff430846 [#416] removing reference to now unused local variable 2011-05-17 20:03:03 +02:00
Gregor Schmidt a5b439544a [#416] introducing separate rjs view to reduce controller code 2011-05-17 20:03:03 +02:00
Gregor Schmidt 4635a8c2a4 [#416] using a simpler approach to replace node with partial 2011-05-17 20:03:02 +02:00
Gregor Schmidt e3f54d470c [#416] :class might be nil or a symbol - then + will not work as expected 2011-05-17 20:03:02 +02:00