e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -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
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
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
a5b439544a
[ #416 ] introducing separate rjs view to reduce controller code
2011-05-17 20:03:03 +02:00
4635a8c2a4
[ #416 ] using a simpler approach to replace node with partial
2011-05-17 20:03:02 +02:00
508b23cf41
[ #416 ] Watcher links work using of css selectors instead of ids
2011-05-17 20:03:02 +02:00
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
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
193b2c7a38
[ #404 ] Move vendor/plugins/acts_as_journalized/app/ to the core app/
2011-05-13 12:34:24 -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
dbd6dfc69b
[ #373 ] Refactoring auto_completes#issues action
...
hoping to make it more intention revealing
2011-05-04 19:12:56 +02:00
8509212991
[ #373 ] Adding test and fix for duplicates in issue autocompleter
2011-05-04 19:01:15 +02:00
aced650a10
Introducing help layout
2011-05-02 14:32:50 +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
d2973a641e
[ #347 ] Fix potential Execution After Redirect bugs
...
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.
Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
ef8141a2c1
Remove deprecated journals tests and controller.
2011-04-21 11:45:31 +02:00
ed252f7246
[ #309 ] Set the back_url after sending a lost password so HTTP_REFERER isn't used
...
Contributed by Robert Chady
2011-04-20 16:24:54 -07:00
1eee7312f6
[ #289 ] Remove single helpers in favor of :all in ApplicationController
2011-04-20 16:08:00 -07: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
1cab1bd51e
Skip a count(*) SQL query.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -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
35a848dac7
Initialize TimeEntry with issue and project for the issue edit form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5274 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
e06b581595
Adds support for preview when editing an issue note ( #5520 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
be2046b189
scm: set mime type in downloading file.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
6fcddfe2e2
scm: fix non ascii text files displaying ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5204 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
e0f37601f3
Fixed: Simultaneous wiki updates cause internal error ( #7939 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:42 -07:00
a59bd805d3
Indentation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5154 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
4f8e8df6e0
Adds a Group filter on the admin users list ( #7893 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:41:32 -07:00
3c19cacf97
Replaces TimeEntry.visible_by with a visible scope.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:40:03 -07:00
1c0e7790be
scm: recovery showing "root @ branch" in repository tree viewing.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:58 -07:00
fec6eb782c
Moved wiki page updated_on eager load to a scope and fixed timestamp titles on wiki page index ( #7818 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5098 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:55 -07:00
784bbccfc6
Fixed: error on JournalsController#index when custom fields are present ( #7795 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
6f5707c2b5
Adds email notifications support for news comments ( #2074 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:39 -07:00
c9497f39b8
Keep track of issue description changes ( #746 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
40787ff43f
Do not responde with javascript on regular requests.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:07:19 -07:00
cc2d6f3605
Allow additional workflow transitions for issue author and assignee ( #2732 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -07:00
49fde3723b
scm: fix diff revision param validation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
b96115bf7b
[ #310 LSS#5727] Add checkbox option to determine if issue emails should be sent
2011-03-30 11:48:59 -07:00
6cd9bc5ca5
scm: space and tab cleanup of app/controllers/repositories_controller.rb.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
3d11a22624
scm: fix non ASCII filename downloaded from repo is broken on Internet Explorer ( #7288 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-27 10:10:55 -07:00
1aa20b17b4
[ #302 ] Protect ApplicationController methods so they are not considered actions
2011-03-24 14:22:21 -07:00
2c67f6103b
replaced auth_source_id.nil? with change_password_allowed? in users controller
2011-03-24 13:55:50 -07:00
Eric Davis
Tom Kersten
Gregor Schmidt
Felix Schäfer
Jean-Philippe Lang
Toshi MARUYAMA
Stephan Eckardt