4924 Commits

Author SHA1 Message Date
Gregor Schmidt
ae84fff8a2 [#419] Fixing broken multi-select serialization in prototype 1.7
See https://prototype.lighthouseapp.com/projects/8886/tickets/1180 for details.

Contributed by Ben Gunter.
2011-05-23 17:23:50 +02:00
Gregor Schmidt
3a14bff746 [#419] Updating to Prototype 1.7 and script.aculo.us 1.9.0 2011-05-23 09:53:41 +02:00
Holger Just
35a38086e3 [#112] Fix tests for jruby 2011-05-22 19:46:31 +02:00
Holger Just
18247a6c58 [112] Detect SQLite3 version on JRuby 2011-05-22 19:02:53 +02:00
Felix Schäfer
79ed4920cf Merge branch 'unstable' of github.com:chiliproject/chiliproject into unstable 2011-05-21 02:03:10 +02:00
Felix Schäfer
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
Holger Just
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
Eric Davis
c83c1d9aea Merge branch 'ticket/unstable/406-journals-controller-aaj' into unstable 2011-05-20 15:45:54 -07: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
Holger Just
c04ff93f8f [#112] Properly stub SQLite3 for version tests 2011-05-20 23:34:18 +02:00
Eric Davis
6e105a765a Merge branch 'ticket/unstable/400-activity-event-types' into unstable 2011-05-20 14:24:07 -07:00
Eric Davis
078df72345 [#400] Refactor old assert_tag to assert_select 2011-05-20 14:23:54 -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
Eric Davis
c778cc9208 [#415] Fix functional tests that used the older interface 2011-05-20 13:51:21 -07:00
Felix Schäfer
6015913f34 Change test to use the new journalized interface. #415 2011-05-20 22:16:26 +02:00
Gregor Schmidt
08cad02541 Removing commments from wiki_contents fixtures, since the db column was removed as well 2011-05-20 21:33:50 +02:00
Eric Davis
a74517b983 Merge remote-tracking branch 'hufocf/feature/357-wrap-text-in-pdf' 2011-05-20 11:43:24 -07:00
Eric Davis
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
Eric Davis
eaa5382043 [#81] Add a favicon based on a Flickr image
http://www.flickr.com/photos/thebrownhouse/4599233853/sizes/l/
2011-05-20 11:28:40 -07:00
Felix Schäfer
d7b963e6a6 Load the SQLite3 lib for the test to work. #112 2011-05-20 16:10:01 +02: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
333a3187bd Work around a deprecation in rubygems 1.6+. #322 2011-05-20 00:04:04 +02:00
Felix Schäfer
6598a44ddd Add a helper to format user lists. #304 2011-05-19 23:48:02 +02:00
Felix Schäfer
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
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
ae76abd140 [#416] updating watcher controller tests to new functionality
unfortunately assert_select_rjs is not too clever - therefor we need to fall back to string matching for the more complex cases
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
Gregor Schmidt
2c2ed95866 [#416] Re-Adding watcher_tag for backwards compatibility
adding deprecation warning
2011-05-17 20:03:02 +02:00
Gregor Schmidt
508b23cf41 [#416] Watcher links work using of css selectors instead of ids 2011-05-17 20:03:02 +02:00
Felix Schäfer
9cb4feefce Update the watcher list on click on "watch". #311
Based on a patch contributed by Price M.
2011-05-17 20:03:01 +02:00
Felix Schäfer
90c713d2d2 Recognize git Repositories of the form 'identifier.git' in the apache perl module. 2011-05-16 06:11:59 -07:00
Holger Just
7b3a2047fd Whitespace fixes 2011-05-16 00:03:51 +02:00
Holger Just
705c0db000 [#112] Fix failing raw version for postgres 2011-05-16 00:01:09 +02:00
Holger Just
c51eb7059a [#340] Format blockquote tags in emails. 2011-05-15 23:42:39 +02:00
Holger Just
d90102420d [#112] Adapt database switches to use ChiliProject::Database 2011-05-15 23:15:52 +02:00
Holger Just
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
Felix Schäfer
20d804825d Update the watcher list on click on "watch". #311
Based on a patch contributed by Price M.
2011-05-14 17:54:11 +02:00
Felix Schäfer
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
Felix Schäfer
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
Felix Schäfer
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
Gregor Schmidt
76c72d8f11 [#414] remove returning which will be removed in future versions of Rails 2011-05-14 00:19:53 +02:00
Gregor Schmidt
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
Gregor Schmidt
09fd71232e [#412] fixes to make tests run on 1.9.2 2011-05-13 23:52:24 +02:00
Eric Davis
0ed2af49e9 [#408] Removed old JournalDetail test 2011-05-13 12:51:44 -07:00
Eric Davis
193b2c7a38 [#404] Move vendor/plugins/acts_as_journalized/app/ to the core app/ 2011-05-13 12:34:24 -07:00