1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 08:51:13 +00:00

1216 Commits

Author SHA1 Message Date
Jean-Philippe Lang
10711fda6d Merged r9837 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-17 09:01:17 +00:00
Jean-Philippe Lang
ba3828b49f Backported r9797 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 20:30:58 +00:00
Jean-Philippe Lang
fe1a152e02 Merged r9798 to r9801 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 13:40:02 +00:00
Jean-Philippe Lang
bca6c447cb Merged r9740 and r9741 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-03 08:13:58 +00:00
Jean-Philippe Lang
e62a40a719 Merged r9689 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-13 11:27:09 +00:00
Jean-Philippe Lang
81c207b193 Restored rescue statement removed in r9684.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-13 09:46:36 +00:00
Jean-Philippe Lang
60cdcd5522 Redirect to referer when deleting a user (#10865).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-13 09:17:56 +00:00
Jean-Philippe Lang
eb53d600c9 Fixed that REST Uploads fail with fastcgi in 1.4-stable (#10832).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9653 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-08 10:39:42 +00:00
Jean-Philippe Lang
e5802895ce Merged r9417 from trunk (#10664).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-20 07:45:33 +00:00
Jean-Philippe Lang
fd450fd2da Merged r9404, r9405 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9411 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-14 06:54:02 +00:00
Jean-Philippe Lang
1feb373c89 Merged r9378 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-14 04:51:49 +00:00
Jean-Philippe Lang
83ea66fd2c Merged r9379 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9395 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-14 04:43:41 +00:00
Jean-Philippe Lang
ef2c5cab2d Merged r9392 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9393 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-13 19:41:05 +00:00
Jean-Philippe Lang
a4c0c18e3d Merged r9384, r9385 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9386 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-11 17:27:44 +00:00
Jean-Philippe Lang
687fca170e Merged r9359 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 13:51:55 +00:00
Jean-Philippe Lang
34016c38bd Merged r9349 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9354 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 12:39:51 +00:00
Etienne Massip
d36d64f664 Fixed Internal Error in watchers XHR search (#10600).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9323 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-05 18:10:54 +00:00
Jean-Philippe Lang
274566f13b Failing test with 1.8.7 and jruby (#10538).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-25 20:21:04 +00:00
Jean-Philippe Lang
6115a079ec Remove duplicate watchers (#10538).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9268 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-25 19:35:32 +00:00
Jean-Philippe Lang
fae5250e52 Ability to add non-member watchers on issue creation (#5159).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-24 12:57:28 +00:00
Jean-Philippe Lang
bd47af098f Merged LdapAuthSourceController into AuthSourceController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9232 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-11 11:43:27 +00:00
Jean-Philippe Lang
125f5e1710 Use #find_project_by_project_id from super-class.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9172 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-10 13:44:52 +00:00
Jean-Philippe Lang
036b81abfd Use #find_project_by_project_id from super-class.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-07 20:03:05 +00:00
Jean-Philippe Lang
2bcf9f2871 Prevent mass-assignment when adding/updating a forum (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 21:36:28 +00:00
Jean-Philippe Lang
efddab48be Prevent mass-assignment when adding/updating a wiki (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9138 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 20:34:38 +00:00
Jean-Philippe Lang
fef2e4b672 Prevent mass-assignment when adding/updating a version (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9137 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 20:31:45 +00:00
Jean-Philippe Lang
1ec2d98c14 Prevent mass-assignment when adding/updating a time entry (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9136 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 20:23:00 +00:00
Jean-Philippe Lang
0ee1de5686 Use safe_attributes= just like in #create.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9135 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 19:52:10 +00:00
Jean-Philippe Lang
d0356fe935 Prevent mass-assignment when adding/updating a news (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9134 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 19:50:10 +00:00
Jean-Philippe Lang
286bda14f1 Prevent mass-assignment when adding/updating a forum message (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9133 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 19:46:59 +00:00
Jean-Philippe Lang
2c6ad7525a Prevent mass-assignment when adding a project member (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9132 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 19:39:37 +00:00
Jean-Philippe Lang
460239d1f9 Prevent mass-assignment when adding/updating an issue category (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9131 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 18:59:32 +00:00
Jean-Philippe Lang
809d35d34b Prevent mass-assignment when adding/updating a document (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 18:54:41 +00:00
Jean-Philippe Lang
bdf6e90f05 Prevent mass-assignment when adding a news comment (#10390).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9129 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 18:48:47 +00:00
Jean-Philippe Lang
6aad82e524 Fixed that the proposed users list may be empty when adding a project member (#10374).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9128 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-06 18:37:30 +00:00
Jean-Philippe Lang
6b47cad8ce Cleanup in TimelogController#destroy.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9095 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 15:24:14 +00:00
Jean-Philippe Lang
dc50edae5e Adds a template for API error messages so that it does not depend on AR::Errors serialization.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 15:16:50 +00:00
Jean-Philippe Lang
d862843c9d Renamed Mailer#test to Mailer#test_email.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9080 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 12:38:34 +00:00
Jean-Philippe Lang
64d843a4d7 Rails 3.1 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 11:41:10 +00:00
Jean-Philippe Lang
af75583b23 Adds Redmine::Utils.random_hex for generating a random hex string.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9071 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 11:05:02 +00:00
Jean-Philippe Lang
70ced2f2af Rails 3.1 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9067 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 10:44:59 +00:00
Jean-Philippe Lang
c7b1a42d19 Adds Redmine::Plugin.public_directory to be used instead of Engines.public_directory.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9065 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 10:29:47 +00:00
Jean-Philippe Lang
b3866b05c1 Removes all #verify calls in controllers. Verification is handled at routing level now that the default route is removed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9061 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-03 15:09:20 +00:00
Jean-Philippe Lang
9c4014f446 Use a single query to retrieve issues on the roadmap.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9057 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-02 16:27:14 +00:00
Jean-Philippe Lang
9ffccf5304 Adds functional test for #test_connection.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-02 11:31:44 +00:00
Jean-Philippe Lang
7448e0dbc4 Fixed that the bulk edit/copy form does not propose versions and categories for the target project (#10350).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9046 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-01 20:22:08 +00:00
Jean-Philippe Lang
65b4d8a649 Make sure that projects_to_search is a Project Array.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9013 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-26 11:42:29 +00:00
Jean-Philippe Lang
b6742bda3d Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9002 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-25 13:04:34 +00:00
Jean-Philippe Lang
cf9154f924 Can not use Project#find on scopes with Rails 3.1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9001 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-25 12:57:30 +00:00
Jean-Philippe Lang
0cc60f3631 Use content_tag for empty option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9000 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-25 12:37:28 +00:00