2f0d13149d
Copyright header update
2011-12-17 15:50:52 -08:00
3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
4656cf1c57
Escape raw input if there is a Liquid syntax error
2011-12-17 21:57:01 +01:00
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
971277b507
[ #692 ] Fix failing test due to design changes
2011-12-09 18:06:19 -08:00
0eeeb04c31
[ #692 ] removes div#admin-menu - now content of main menu
2011-12-09 14:04:02 -08:00
ba0ded88c3
Merge pull request #125 from finnlabs/pulls/708/journal_class_name_in_attribute
...
Bug #708 : AAJ does not create journals, when models are created using sub classes
2011-12-09 13:36:40 -08:00
7d1c0374e4
Merge branch 'ticket/unstable/747-capybara' into unstable
2011-12-09 13:28:33 -08:00
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
b32fc97314
[ #747 ] Add some capybara helper methods
2011-12-01 18:13:27 -08:00
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
24538a4af2
[ #735 ] Log time form on issue update should only be displayed with log_time permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:28:20 +01:00
59dc103492
[ #735 ] Don't allow time entry creation with only edit permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:27:59 +01:00
add0bf4d0a
Don't double-escape project names in base layout.
2011-11-27 17:01:46 +01:00
0b952a1edd
[ #263 ] Fix test error on Ruby 1.9
...
TreeNode#to_s (from the rubytree gem) is broken. It is implicitly called by
Shoulda on 1.9 only. As we don't actually need it, we just remove the method.
The bug is reported at http://rubyforge.org/tracker/index.php?func=detail&aid=29435&group_id=1215&atid=4793
2011-11-26 20:36:56 +01:00
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
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
b1d9667335
Fix test so it runs in isolation
2011-11-20 02:49:22 +01:00
a31a4a8852
[ #604 ] Adapt fixtures for new liquid syntax
2011-11-20 02:49:22 +01:00
dedf696666
[ #604 ] Add missing test for Liquid
2011-11-20 02:49:22 +01:00
464dafc1e7
[ #604 ] We don't support the old escape style anymore
2011-11-20 02:49:22 +01:00
7906afe6b9
[ #604 ] Add an IssueDrop with custom field support
2011-11-20 02:49:12 +01:00
6f8d8c4105
[ #604 ] Add basic WikiPageDrop
2011-11-19 23:34:52 +01:00
91914cb877
[ #604 ] Add simple Liquid drops for Projects and Principals
2011-11-19 23:33:36 +01:00
fb7f109ac6
[ #708 ] Adding tests exposing the erroneous behavior
2011-11-17 11:17:11 +01:00
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
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
f10412ef71
[ #263 ] Update tests for views in the new layout
2011-11-06 17:46:31 -08:00
a911d83889
[ #263 ] Fix theme tests that changed singleton data
2011-11-06 16:39:28 -08:00
b160217299
Use full paths to test_helper.rb for metric_fu/rcov to pick up
2011-11-03 19:43:20 -07:00
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
667c4d157f
[ #591 ] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde'
2011-10-29 21:22:35 +02:00
6fcb1de63a
Graciously handle deleted custom fields on issue history view.
2011-10-29 18:29:18 +02:00
92dd2934ae
Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
...
[#652 ] fixes wrong redirect after login
2011-10-29 08:47:02 -07:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
aa8237c546
fix application_helper_test
2011-10-29 13:44:47 +02:00
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +02:00
2b7a221dee
[ #672 ] Allow each Query to control if subprojects are included or not
2011-10-25 18:13:32 -07:00
a107202a04
Fix race-condition in test_utc_time_format
2011-10-16 20:46:57 +02:00
61b9939be3
Add basic tests for the Null Formatter
2011-10-16 20:03:23 +02:00
34dc06a85f
[ #652 ] fixes wrong redirect after login
...
when url contains umlaute
2011-10-11 18:16:43 +02:00
b47a90b424
Allow to filter watchers by more than just "me". #566
2011-10-03 09:52:00 +02:00
c57c598204
Fix trailing whitespace
2011-08-27 18:26:12 +02:00
1796fddd2b
[ #275 ] Add requires_chiliproject. We now use the rubygems dependency syntax.
2011-08-21 14:47:31 +02:00
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
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
fc84783de1
[ #124 ] Validate user status changes
2011-08-02 02:26:55 +02:00
76490fcda5
Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail'
2011-07-27 16:03:14 +02:00
008a29dcbc
[ #539 ] removing helper method from tests, adding TODO
2011-07-26 23:00:51 +02:00
f0d271bee3
Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first)
2011-07-25 21:22:13 +02:00
Eric Davis
Holger Just
Romano Licker
Felix Schäfer
Gregor Schmidt
Kornelius Kalnbach
Jean-Philippe Lang
Gregor Schmidt