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
bf90848ae8
Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable
2011-05-13 09:29:48 -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
13de4cc4b0
[ #383 ] Fixed failing tests due to a helper method name conflict (to_utf8)
...
Introduced in 1eee7312f6
2011-05-06 16:38:13 -07:00
1f8828838e
[ #123 ] Attachment changes need to be prefixed
2011-05-06 14:08:39 -07:00
bfacd827a8
Removig english strings from RepositoriesHelper
2011-05-05 22:05:41 +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
d4adcae569
Update the Issue#show.api to new journals type
2011-04-21 11:44:55 +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
e78149f85c
Keep issue filter params on sort headers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
1335548949
Changes pagination links to non-AJAX requests ( #5138 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:53 -07:00
07cf681d61
Makes all pagination-like links use #link_to_content_update ( #5138 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:50 -07:00
844c0d97aa
Removed the changeset-changes class to the commit logs on the issue view ( #8038 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5300 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
0c0763ad4b
Disable unused fields when switching the period type.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -07:00
82b638f727
Removed hidden project_id and issue_id parameters.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5298 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:20 -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
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
1d0b4dcdcc
Do not load projects association in #rolled_up_trackers.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5293 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
3374130e60
Skip a few count(*) SQL queries on the issue list.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5292 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
2431d830b1
No PUT request to get previous/next month.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5287 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
4e6962e7c9
Keep filter params in 'Per page' links.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
561fc8b0f2
Disable unused filter fields so they don't get submitted.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5277 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
8fae4e2ee5
Fixes #possible_values_options when given an object with nil project.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 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
c8682120db
Possible values label not hidden on custom field form.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
5f3d184880
Modules selection lost on project form after validation failure ( #8012 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00
33c28af67a
Removed hard coded french strings ( #8020 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -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
9fa13cf4b8
Save queries.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5245 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
2e2f79aa27
Save 2 queries when displaying a root issue.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
d022da5dd5
Save 1 query + 1 cache hit in #shared_versions for root projects.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5243 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
23149957db
Adds wiki toolbar to notes editing form ( #7899 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
8c57b95c6a
Load scripts and css for wiki formatter toolbar when needed.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
dafbb8b283
Fixed links in new file notification broken by r4051 ( #6590 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
4bcba6a094
Adds support for saturday as the first week day ( #7097 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Eric Davis
Adam Soltys
Gregor Schmidt
Simon COURTOIS
Felix Schäfer
Jean-Philippe Lang