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
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
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
b1d9667335
Fix test so it runs in isolation
2011-11-20 02:49:22 +01: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
b160217299
Use full paths to test_helper.rb for metric_fu/rcov to pick up
2011-11-03 19:43:20 -07:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
54b4fdf1aa
[ #124 ] Allow to delete users with STATE_REGISTERED
2011-08-02 02:27:37 +02:00
76c9a6682f
Remove duplicated test
2011-06-03 09:15:46 -07: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
5a9ffe9627
Merge branch 'feature/350-use_rails_cache_for_settings_cache' into unstable
2011-05-27 15:00:08 -07:00
9baa310486
Fixed test by replacing assert_tag with assert_select
2011-05-27 14:16:38 -07:00
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
46f66add1f
Merge remote-tracking branch 'schmidt/f/416-redo-watcher-links-unstable' into unstable
2011-05-27 10:42:53 -07:00
762cc04b70
Port 784bbccf's custom value test back into aaj
2011-05-27 10:16:47 -07:00
f883758c95
Fix test: Search results are showing this as an issue-edit event
2011-05-27 10:15:49 -07:00
c51a32ac23
Use Rails.cache to cache application settings. #350
2011-05-25 17:11:16 +02:00
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
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
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
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
c778cc9208
[ #415 ] Fix functional tests that used the older interface
2011-05-20 13:51:21 -07:00
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
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
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
65953cdc04
[ #123 ] Fix AttachmentsController test from 1f88288
2011-05-06 14:48:11 -07:00
8509212991
[ #373 ] Adding test and fix for duplicates in issue autocompleter
2011-05-04 19:01:15 +02:00
0b7b564a34
adding basic test, to make sure, nothing breaks
2011-05-02 15:24:11 +02:00
8fb5e8b211
Introducing help controller, moving wiki syntax documentation to help controller
2011-05-02 12:45:19 +02:00
bdc7325a82
Merge branch 'master' into unstable
...
Conflicts:
doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -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
72cd7f2049
[ #347 ] Add missing fixture when running a focused test
2011-04-28 14:22:29 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
61f0e67c0d
Upgrade tests to new journals type.
2011-04-21 11:46:00 +02:00
ef8141a2c1
Remove deprecated journals tests and controller.
2011-04-21 11:45:31 +02:00
42653cef32
Shorten query[column_names] param name.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
789ccec246
Changed timelogs filters to use non-AJAX requests ( #1965 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
61d4a623a8
Fixed: list of users for adding to a group may be empty if 100 first users have been added ( #8029 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
bb4a10fc85
Fixed: bulk destroying parent and child issues raises a stale object error ( #7920 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:18 -07:00
62a4170531
Shortens filter param names.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 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
52be4a13b0
Fix annotate functional roles_controller_test.rb due fails to changing en.yml ( #8035 , #7855 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5269 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
6ac1b6d4ef
scm: git: fix annotate test due to changing en.yml ( #8035 , #7855 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5268 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
Eric Davis
Felix Schäfer
Holger Just
Felix Schäfer
Gregor Schmidt
Jean-Philippe Lang
Toshi MARUYAMA