79ed4920cf
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-21 02:03:10 +02:00
6f809b826e
Replace a call to changes with its code from AR::Dirty. #422
...
acts_as_journalized called changes as per ActiveRecord::Dirty
(see http://ar.rubyonrails.org/classes/ActiveRecord/Dirty.html#M000291 ),
the journalized model Changeset :has_many changes though, which
made the call return a list of associated objects instead of the
intended list of changed attributes. Replaced changes with the code
from AR::Dirty to work around that.
2011-05-21 02:02:52 +02:00
1d5d73afe3
Fix RepositoriesFilesystemControllerTest for jRuby
...
Iconv on jRuby does not accept an empty string as "from" encoding.
Use the default behavior from the controller instead to leave it
unspecified and thuse use UTF-8.
2011-05-21 01:17:17 +02:00
c83c1d9aea
Merge branch 'ticket/unstable/406-journals-controller-aaj' into unstable
2011-05-20 15:45:54 -07:00
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
c04ff93f8f
[ #112 ] Properly stub SQLite3 for version tests
2011-05-20 23:34:18 +02:00
6e105a765a
Merge branch 'ticket/unstable/400-activity-event-types' into unstable
2011-05-20 14:24:07 -07:00
078df72345
[ #400 ] Refactor old assert_tag to assert_select
2011-05-20 14:23:54 -07:00
a4f7629f1f
[ #400 ] Fix some tests broken by 6656103
2011-05-20 14:22:55 -07:00
66561031eb
[ #400 ] Fix the event types (icons on activity and search views).
2011-05-20 13:51:51 -07:00
c778cc9208
[ #415 ] Fix functional tests that used the older interface
2011-05-20 13:51:21 -07:00
6015913f34
Change test to use the new journalized interface. #415
2011-05-20 22:16:26 +02:00
08cad02541
Removing commments from wiki_contents fixtures, since the db column was removed as well
2011-05-20 21:33:50 +02:00
00c1852d7d
[ #81 ] Add a favicon based on a Flickr image
...
http://www.flickr.com/photos/thebrownhouse/4599233853/sizes/l/
2011-05-20 11:29:06 -07:00
d7b963e6a6
Load the SQLite3 lib for the test to work. #112
2011-05-20 16:10:01 +02:00
cf0804259d
Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable
2011-05-20 15:45:54 +02:00
dbc10d2730
Save the comments to wiki page updates correctly. #415
2011-05-20 15:44:47 +02:00
6a55e9e738
Merge pull request #57 from meineerde/issues/unstable/112-database-detection-library
...
Database detection library. #112
2011-05-19 14:28:00 -07: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
d90102420d
[ #112 ] Adapt database switches to use ChiliProject::Database
2011-05-15 23:15:52 +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
0957e478ab
Merge pull request #54 from schmidt/b/413-test-errors-in-1.8.6
...
Fix test errors on 1.8.6 after acts_as_journalized merge. #413
2011-05-13 16:38:45 -07:00
00ca2af1d3
Merge pull request #53 from schmidt/b/412-test-errors-in-1.9.2
...
Fix test errors on 1.9.2 after acts_as_journalized merge. #412
2011-05-13 16:36:17 -07:00
d8ae680abb
Merge pull request #56 from schmidt/b/414-remove-returning
...
Remove returning since it causes deprecation warnings. #414
2011-05-13 16:32:13 -07:00
76c72d8f11
[ #414 ] remove returning which will be removed in future versions of Rails
2011-05-14 00:19:53 +02:00
300bc07b5a
[ #413 ] using Hash#to_a.first since Hash#first is not present in 1.8.6
2011-05-14 00:09:56 +02:00
09fd71232e
[ #412 ] fixes to make tests run on 1.9.2
2011-05-13 23:52:24 +02:00
0ed2af49e9
[ #408 ] Removed old JournalDetail test
2011-05-13 12:51:44 -07:00
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -07:00
dabe5caa1a
Merge branch 'ticket/unstable/123-journalized' into unstable
2011-05-13 11:55:56 -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
adf57a64f1
[ #123 ] Move aaj migrations to core
2011-05-13 11:11:41 -07:00
23ef9fedef
[ #123 ] Port the send_notification feature to aaj
2011-05-13 10:56:22 -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
0ca73a7f69
[ #123 ] Fix the down migration for Journal#journalized_type
2011-05-13 10:20:34 -07:00
b1845fcfeb
[ #123 ] Added latest edavis10:acts_as_journalized
2011-05-13 09:55:55 -07:00
62c9fd2185
[ #123 ] Removed the acts_as_journalized submodule
2011-05-13 09:49:56 -07:00
bf90848ae8
Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable
2011-05-13 09:29:48 -07:00
cff4e83044
[ #290 ] Only print the plugin Gemfile messages when $DEBUG is set
2011-05-13 09:19:41 -07:00
68925684fe
Remove generic Rails performance test
2011-05-13 09:16:46 -07:00
6c9c7dc5aa
Merge remote-tracking branch 'schmidt/f/290-bundler' into unstable
2011-05-13 08:55:08 -07:00
f273b7b18c
Create the ChiliProject namespace
2011-05-11 15:48:36 -07:00
90df645cae
Use link_to_user instead of a manual link
2011-05-11 15:40:55 -07:00
315ec5f65c
HTML escape some user values
2011-05-11 15:39:07 -07:00
e9c542d7da
Merge remote-tracking branch 'asoltys/feature/link_to_user_profile_from_account_page' into unstable
2011-05-11 15:29:49 -07:00
f27614b576
make username a link to their profile page
2011-05-11 16:18:04 -06:00
c2d058a53b
[ #390 ] check to handle mysql2's early type casting
2011-05-11 00:19:11 +02:00
Felix Schäfer
Holger Just
Eric Davis
Gregor Schmidt
Felix Schäfer
Adam Soltys