Commit Graph

855 Commits

Author SHA1 Message Date
Eric Davis ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Eric Davis 971277b507 [#692] Fix failing test due to design changes 2011-12-09 18:06:19 -08:00
Felix Schäfer aa88fe8e39 Merge branch 'coderay-1.0' of https://github.com/rubychan/chiliproject into rubychan-coderay-1.0 2011-12-09 16:50:20 +01:00
Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
Felix Schäfer 03d956c360 Merge pull request #90 from meineerde/issues/master/124-delete-registered-users
[124] delete registered users
2011-11-25 09:47:12 -08:00
Eric Davis e6fe1fc776 Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable 2011-11-25 01:44:19 -08:00
Holger Just a31a4a8852 [#604] Adapt fixtures for new liquid syntax 2011-11-20 02:49:22 +01:00
Eric Davis dedf696666 [#604] Add missing test for Liquid 2011-11-20 02:49:22 +01:00
Holger Just 464dafc1e7 [#604] We don't support the old escape style anymore 2011-11-20 02:49:22 +01:00
Eric Davis 7906afe6b9 [#604] Add an IssueDrop with custom field support 2011-11-20 02:49:12 +01:00
Eric Davis 6f8d8c4105 [#604] Add basic WikiPageDrop 2011-11-19 23:34:52 +01:00
Eric Davis 91914cb877 [#604] Add simple Liquid drops for Projects and Principals 2011-11-19 23:33:36 +01:00
Felix Schäfer b1671e46f0 Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
Eric Davis ab2856b53f [#263] Add new layout and theme
Merge branch 'ticket/unstable/263-new-layout-ready' into unstable
2011-11-06 18:18:35 -08:00
Eric Davis a911d83889 [#263] Fix theme tests that changed singleton data 2011-11-06 16:39:28 -08:00
Eric Davis b160217299 Use full paths to test_helper.rb for metric_fu/rcov to pick up 2011-11-03 19:43:20 -07:00
Holger Just cb2086f652 [#647] Fix XSS in textile image syntax.
Image URLs are not properly escaped in the bundled RedCloth3 library.
It thus allowed an XSS vector.

The patch was adapted from r7570 from Redmine by Etiene Massip. See also
http://www.redmine.org/issues/9245.
2011-10-31 17:22:34 +01:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Kornelius Kalnbach aa8237c546 fix application_helper_test 2011-10-29 13:44:47 +02:00
Kornelius Kalnbach 65af1e4436 #649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine 2011-10-29 11:35:16 +02:00
Eric Davis 2b7a221dee [#672] Allow each Query to control if subprojects are included or not 2011-10-25 18:13:32 -07:00
Holger Just a107202a04 Fix race-condition in test_utc_time_format 2011-10-16 20:46:57 +02:00
Holger Just 61b9939be3 Add basic tests for the Null Formatter 2011-10-16 20:03:23 +02:00
Felix Schäfer b47a90b424 Allow to filter watchers by more than just "me". #566 2011-10-03 09:52:00 +02:00
Holger Just c57c598204 Fix trailing whitespace 2011-08-27 18:26:12 +02:00
Holger Just 1796fddd2b [#275] Add requires_chiliproject. We now use the rubygems dependency syntax. 2011-08-21 14:47:31 +02:00
Jean-Philippe Lang 5d7bc5c94c [#577] Avoid validating users when creating watcher relation
Taken from Redmine r5880
Committed by Jean Philippe Lang
2011-08-15 16:05:37 +02:00
Holger Just fc84783de1 [#124] Validate user status changes 2011-08-02 02:26:55 +02:00
Holger Just 76490fcda5 Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail' 2011-07-27 16:03:14 +02:00
Gregor Schmidt 008a29dcbc [#539] removing helper method from tests, adding TODO 2011-07-26 23:00:51 +02:00
Holger Just f0d271bee3 Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first) 2011-07-25 21:22:13 +02:00
Gregor Schmidt bf14f35223 [#537] version of new WikiContents should be 0 2011-07-25 19:07:05 +02:00
Eric Davis 4b3bd797b0 Fix errors when trying to check for binary SCM strings in 1.9.2
1.9.2 removed String#is_binary_data?
2011-07-22 14:35:01 -07:00
Eric Davis 3b9980b449 Fix aaj to allow setting the journal user, note, and attributes directly.
This will allow the Journaled object to reliability set the fields on the Journal
without calling init_journal (which is a before_save hook and shouldn't be called
directly).
2011-07-11 16:55:28 -07:00
Eric Davis 4a3e32b0f4 [#514] Fix forum notifications, only one email per created Message 2011-07-08 14:49:39 -07:00
Eric Davis 86b30810a4 Fix test so it will run in isolation 2011-07-08 12:44:42 -07:00
Eric Davis 1fae552c8f [#467] Fix Journal#journaled to prevent uninitialized constant Journal::Journaled 2011-07-08 12:43:03 -07:00
Eric Davis 2fab2de517 Workaround a test timing bug in CI for the release 2011-07-01 16:28:13 -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 3d164f1da0 [#480] Fix replying to IssueJournals through email 2011-06-17 12:10:23 -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 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 bfba5e2151 [#441] 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 [#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
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 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 db3480bdb6 [#436] Fix test relying on trailing whitespace. 2011-05-31 09:59:19 +02:00