Commit Graph

4898 Commits

Author SHA1 Message Date
Eric Davis bc249871a6 [#407] Remove deferred Journal#visible tests 2011-05-29 11:11:26 -07:00
Eric Davis 8b06e26059 [#350] Force clearing the cache before each test 2011-05-27 15:52:24 -07:00
Eric Davis 5a9ffe9627 Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable 2011-05-27 15:00:08 -07:00
Eric Davis e4fac8d40f [#350] Refactor: extract method 2011-05-27 14:59:42 -07:00
Eric Davis 9e1b6c14c8 [#345] Remove BigDecimal patch since Rails 2.3.11 includes a mitigation 2011-05-27 14:37:10 -07:00
Eric Davis 9baa310486 Fixed test by replacing assert_tag with assert_select 2011-05-27 14:16:38 -07:00
Eric Davis b95c526151 Fix failing test: RepositoryMercurialTest#test_activities 2011-05-27 14:08:18 -07:00
Eric Davis cd64d11e17 Merge branch 'master' into unstable
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
Eric Davis 44b1bcfa37 Merge branch 'release-v1.4.0' 2011-05-27 11:41:22 -07:00
Eric Davis aae1abde5c Merge branch 'release-v1.4.0' into stable 2011-05-27 11:39:08 -07:00
Eric Davis 0e31482de9 Bump version to 1.4.0 2011-05-27 11:37:03 -07:00
Eric Davis f6454629f2 Update Changelog for release 1.4.0 2011-05-27 11:22:49 -07:00
Eric Davis 46f66add1f Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable 2011-05-27 10:42:53 -07:00
Tom Kersten ce8bb652c6 [#423] Removed explicit render in WikiController#show
* Allows for format extensions in plugins w/o giving a double-render
  error
* Updated Wiki#show template to specify 'wiki/sidebar' explicitly
  (vs. just 'sidebar')
2011-05-27 10:20:45 -07:00
Eric Davis 762cc04b70 Port 784bbccf's custom value test back into aaj 2011-05-27 10:16:47 -07:00
Eric Davis f883758c95 Fix test: Search results are showing this as an issue-edit event 2011-05-27 10:15:49 -07:00
Eric Davis e9676954be Fix tpyo in the example 2011-05-27 09:28:45 -07:00
Eric Davis b8904ce7a2 Handle a nil user when testin email.
undefined method `logged?' for nil:NilClass
2011-05-27 09:27:05 -07:00
Eric Davis 5cbf188032 Merge remote-tracking branch 'schmidt/b/425-avoid-deprec-notation-for-rake-tasks/master' 2011-05-27 09:26:07 -07:00
Eric Davis c4658bd271 [#202] Add the theme used on chiliproject.org
Using 3c2ef2757165e23b65fd from
https://github.com/edavis10/squeejee_theme/tree/chiliproject.org
2011-05-27 09:18:48 -07:00
Emilio Carlos da Palma 7796ae89ff Fix the issue #424. 2011-05-26 21:09:21 -03:00
Felix Schäfer c51a32ac23 Use Rails.cache to cache application settings. #350 2011-05-25 17:11:16 +02:00
Felix Schäfer 5c8e04db55 Fix SearchController tests.
The "dd" the removed assert_tag part was supposed to find should never show up on the page in the first place (it's in a journal, not in the issue itself).
2011-05-25 16:40:34 +02:00
Gregor Schmidt 20a5e41538 [#425] Avoid deprecated API to define rake tasks with parameters
This should avoid deprecation warnings when using ChiliProject with Rake 0.9
2011-05-24 17:02:30 +02:00
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