d24e8186b4
Merge remote-tracking branch 'chiliproject/master' into unstable
2011-12-18 21:33:05 +01:00
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
0f8a040d28
[ #3619 ] Validate the AuthSourceLdap#custom_filter
...
Conflicts:
app/models/auth_source_ldap.rb
test/unit/auth_source_ldap_test.rb
2011-12-13 20:56:31 +01:00
1318ac204e
[ #3619 ] Allow defining a custom ldap filter for AuthSourceLdap.
...
Conflicts:
app/models/auth_source_ldap.rb
config/locales/en.yml
test/unit/auth_source_ldap_test.rb
2011-12-12 13:43:21 +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
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
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
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
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
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
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
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
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
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
bf14f35223
[ #537 ] version of new WikiContents should be 0
2011-07-25 19:07:05 +02:00
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
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
4a3e32b0f4
[ #514 ] Fix forum notifications, only one email per created Message
2011-07-08 14:49:39 -07:00
86b30810a4
Fix test so it will run in isolation
2011-07-08 12:44:42 -07:00
1fae552c8f
[ #467 ] Fix Journal#journaled to prevent uninitialized constant Journal::Journaled
2011-07-08 12:43:03 -07:00
2fab2de517
Workaround a test timing bug in CI for the release
2011-07-01 16:28:13 -07:00
32f92a5058
[ #501 ] Ugly patch to stop creating journals when only line endings change
2011-07-01 12:25:07 -07:00
3d164f1da0
[ #480 ] Fix replying to IssueJournals through email
2011-06-17 12:10:23 -07:00
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
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
bfba5e2151
[ #441 ] Journals should touch their journaled to update updated_on/at fields
2011-06-05 11:49:40 -07:00
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
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
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
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
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
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
db3480bdb6
[ #436 ] Fix test relying on trailing whitespace.
2011-05-31 09:59:19 +02:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
bc249871a6
[ #407 ] Remove deferred Journal#visible tests
2011-05-29 11:11:26 -07:00
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
35a38086e3
[ #112 ] Fix tests for jruby
2011-05-22 19:46:31 +02:00
18247a6c58
[112] Detect SQLite3 version on JRuby
2011-05-22 19:02:53 +02:00
c04ff93f8f
[ #112 ] Properly stub SQLite3 for version tests
2011-05-20 23:34:18 +02:00
6015913f34
Change test to use the new journalized interface. #415
2011-05-20 22:16:26 +02:00
d7b963e6a6
Load the SQLite3 lib for the test to work. #112
2011-05-20 16:10:01 +02:00
2c2ed95866
[ #416 ] Re-Adding watcher_tag for backwards compatibility
...
adding deprecation warning
2011-05-17 20:03:02 +02:00
7b3a2047fd
Whitespace fixes
2011-05-16 00:03:51 +02:00
705c0db000
[ #112 ] Fix failing raw version for postgres
2011-05-16 00:01:09 +02:00
8279144073
[ #112 ] Add ChiliProject::Database
...
This module can be used to gather information about the currently used
database.
2011-05-15 23:14:02 +02:00
0ed2af49e9
[ #408 ] Removed old JournalDetail test
2011-05-13 12:51:44 -07:00
f79e209d4c
[ #123 ] Fix hardcoded test value with a dynamic one
2011-05-13 11:53:25 -07:00
0ba4134ecc
[ #123 ] Fix Journal notification test
2011-05-13 11:33:51 -07:00
aa2b0a8709
[ #123 #407 ] Deferred Journal#visible tests
2011-05-13 11:26:06 -07:00
216619d376
Merge branch 'unstable' into ticket/unstable/123-journalized
...
Conflicts:
test/unit/journal_test.rb
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
13de4cc4b0
[ #383 ] Fixed failing tests due to a helper method name conflict (to_utf8)
...
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
cd73bd714f
[ #123 ] Fix test error due to un-reloaded object daddy objects
2011-05-06 14:48:11 -07:00
cc0c2165b5
[ #123 ] Fix test on postgres, .first isn't based on ORDER
2011-05-06 14:48:11 -07:00
614bad89a5
Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable
...
Conflicts:
config/locales/en.yml
test/unit/journal_test.rb
2011-04-29 08:46:13 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
43ee27715a
JournalDetails don't exist anymore.
2011-04-21 00:01:26 +02:00
ff431e8ed4
Force changeset journal creation.
2011-04-20 23:49:21 +02:00
cfbe69ab59
Fixed: deleting a parent issue may lead to a stale object error ( #7920 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
8fae4e2ee5
Fixes #possible_values_options when given an object with nil project.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
d8fbdca760
Adds User and Version custom field format that can be used to reference a project member or version in custom fields ( #2096 ).
...
These new field formats are available for project, issue, version and time entry custom fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
5f3d184880
Modules selection lost on project form after validation failure ( #8012 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
b944276e30
Fixes progress calculation on gantt ( #7838 ).
...
Contributed by Etienne Massip.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
7d59698021
Fixes wrong test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5231 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:48 -07:00
dafbb8b283
Fixed links in new file notification broken by r4051 ( #6590 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
4bcba6a094
Adds support for saturday as the first week day ( #7097 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
c0d55c936b
Moved calendar tests to unit/lib/redmine/helpers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5226 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
ff5203d2c6
Fixed: unknown custom field format causes error when editing/bulk editing ( #7985 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5214 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
80b7a1e432
scm: filesystem: update test repository for non ascii text files displaying ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5203 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
862e4e716d
scm: filesystem: change project id of unit model test from 1 to 3.
...
Project id 1 has Subversion fixtures.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5193 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
476106ac0f
scm: filesystem: code clean up unit model test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5192 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
b06f24e932
scm: filesystem: code clean up unit adapter test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:43 -07:00
1d93b0e9f6
Fixed: news comments not deleted when deleting a project ( #7904 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:41 -07:00
Holger Just
Eric Davis
Felix Schäfer
Gregor Schmidt
Kornelius Kalnbach
Jean-Philippe Lang
Gregor Schmidt
Toshi MARUYAMA
Felix Schäfer