meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity
11,015 Commits 32 Branches 194 Tags
Commit Graph

5388 Commits

Author SHA1 Message Date
Toshi MARUYAMA
5a96012ad0 remove trailing white-space from app/models/issue_custom_field.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 02:54:12 +00:00
Toshi MARUYAMA
cc688bb1b1 Backport r13313 from rails-4.1 to trunk. 
Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 14:17:52 +00:00
Jean-Philippe Lang
5ccbe10d10 Code cleanup (#17717). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 11:38:52 +00:00
Jean-Philippe Lang
51db15ac61 Parent issue autocomplete does not follow to the "Allow cross-project subtasks" setting (#14281). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 10:42:31 +00:00
Jean-Philippe Lang
4fba4ca691 Fixed: Issues counters in roadmap only link to issues in the same project (#9660). 
Contributed by Sridhar Dhanapalan.

git-svn-id: http://svn.redmine.org/redmine/trunk@13398 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 09:41:39 +00:00
Jean-Baptiste Barth
2eb95f41b4 Invalidate security tokens on password or email changes (#17717). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 08:22:25 +00:00
Jean-Philippe Lang
d30367d46b Issue API: include is_private attribute in xml/json output (#10914). 
Patch by Shivam Daryanani.

git-svn-id: http://svn.redmine.org/redmine/trunk@13395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 11:22:49 +00:00
Jean-Philippe Lang
e6761e30e5 Moves project sidebar content to a partial (#17380). 
Patch by Jérôme BATAILLE.

git-svn-id: http://svn.redmine.org/redmine/trunk@13393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 10:53:13 +00:00
Jean-Philippe Lang
77b0abb79c Fixed: The error flash message on session expiration is not in the language of the user but of the user of the previous request (#17023). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13391 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 10:35:46 +00:00
Jean-Philippe Lang
e124da5488 Fixed: Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163). 
Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 10:17:15 +00:00
Jean-Baptiste Barth
1612da75d1 Mark private notes more clearly (#16240). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13367 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-09 03:53:25 +00:00
Jean-Baptiste Barth
d00f875800 Make 2nd parameter optional in User#allowed_to_globally? for consistency (#6498). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13364 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-06 03:39:52 +00:00
Jean-Baptiste Barth
63cb3680c1 Include enabled modules in projects API (#17602). 
Contributed by Jan Schulz-Hofen <jan@plan.io>


git-svn-id: http://svn.redmine.org/redmine/trunk@13363 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-06 03:17:51 +00:00
Jean-Baptiste Barth
c190496f24 Fix syntax for ruby 1.8.7 (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:36:06 +00:00
Jean-Baptiste Barth
ad9a35c6b9 Optimize committers/users map retrieval for statistic graphs (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:23:48 +00:00
Jean-Baptiste Barth
8c945fb791 Honnor committers/users mapping in repository statistics (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 17:32:01 +00:00
Jean-Baptiste Barth
41bf39df36 Move some RepositoriesController logic to Repository#stats_by_author (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13351 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 13:58:58 +00:00
Toshi MARUYAMA
e3e14ce3a1 revert r13199 (#17151) 
Chrome 36.0.1985.143 was released.

git-svn-id: http://svn.redmine.org/redmine/trunk@13350 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 08:15:11 +00:00
Toshi MARUYAMA
64255dc663 remove unneeded setting self[left_column_name] and self[right_column_name] from Issue#update_nested_set_attributes_on_parent_change (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13345 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-23 05:45:49 +00:00
Jean-Baptiste Barth
772418461f Add project is_public to GET /projects/:id and /projects API response (#17628). 
Contributed by Michael Esemplare <michael.esemplare@gmail.com>



git-svn-id: http://svn.redmine.org/redmine/trunk@13339 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-15 09:57:00 +00:00
Toshi MARUYAMA
2f6070bb2b fix test failure on Ruby 1.8.7 PostgreSQL (#17484) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13338 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-13 16:08:55 +00:00
Jean-Philippe Lang
efc05bc73c Add time entries custom fields to the context menu for quick bulk edit (#17484). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:52:27 +00:00
Jean-Philippe Lang
41e7210210 Fixed an error when member's project is nil (#17486). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:49:53 +00:00
Jean-Philippe Lang
2a4fdf6755 WARNING: Can't mass-assign protected attributes: user_id, type. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:21:17 +00:00
Jean-Philippe Lang
9f7901e364 Fixed that query roles are not copied when copying a project (#17202). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:20:44 +00:00
Jean-Philippe Lang
ce3c878941 Use type="button" instead of return false; (#17401). 
Patch by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@13326 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 13:06:03 +00:00
Jean-Philippe Lang
2e04614e21 Don't prepend project name if the version is not shared. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 11:26:29 +00:00
Jean-Philippe Lang
579d687580 Adds version date as title in #link_to_version (#17431). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13324 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 11:03:44 +00:00
Jean-Philippe Lang
dd11d70eb9 Moved #link_to_version to ApplicationHelper (#17431). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13322 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 10:35:10 +00:00
Toshi MARUYAMA
d29799712f remove unneeded statement from Issue#parent_issue_id= 
git-svn-id: http://svn.redmine.org/redmine/trunk@13303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-13 00:04:23 +00:00
Toshi MARUYAMA
c2e75254b7 remove trailing white-spaces from app/models/user.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-11 08:04:52 +00:00
Jean-Philippe Lang
5f4ba3d6d5 Fixed relative "source" links in email notifications (#3483). 
Patch by William Baum.

git-svn-id: http://svn.redmine.org/redmine/trunk@13219 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-05 10:43:45 +00:00
Jean-Philippe Lang
b91cbcaa03 Option to render boolean custom fields as a single check box or radio buttons (#17003). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13216 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-05 09:59:17 +00:00
Jean-Philippe Lang
0125ba14f6 Don't redirect to another suburi (#16530). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13213 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-05 09:02:38 +00:00
Toshi MARUYAMA
1b01a7ab5e remove trailing white-space from app/models/workflow_permission.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-03 23:03:39 +00:00
Toshi MARUYAMA
45a744d77d use \A instead of ^ for RegExp (#16190) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:33 +00:00
Toshi MARUYAMA
4b55bb913c only ignore undesirable Auto-Submitted headers defined in RFC3834 (#16190) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13206 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:18 +00:00
Toshi MARUYAMA
1b750f3192 fix file upload broken on Chrome 36 (#17151) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13199 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-01 03:52:43 +00:00
Toshi MARUYAMA
cb7b57815e prevent "can't modify frozen String" exception when mail sending error (#17235) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-01 03:52:27 +00:00
Toshi MARUYAMA
a8389c4019 revert r13183 (#17151) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13186 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-25 17:09:15 +00:00
Toshi MARUYAMA
5f99260cc2 fix file upload broken on Chrome 36 (#17151) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13183 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-25 13:23:52 +00:00
Toshi MARUYAMA
c1f17037e4 fix variable name confusion at AttachmentsController#thumbnail 
This is suggested by Rails team.
https://github.com/rails/rails/issues/15471#issuecomment-45419147

git-svn-id: http://svn.redmine.org/redmine/trunk@13176 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-08 04:23:59 +00:00
Toshi MARUYAMA
d0c741c88c remove redundant empty lines from app/models/auth_source_ldap.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 14:37:56 +00:00
Jean-Philippe Lang
b189d85dde Remove useless settings when editing a query from the gantt (#16747). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 17:01:16 +00:00
Jean-Philippe Lang
8aeab43247 Count users with a single query on group list (#16905). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:41:13 +00:00
Toshi MARUYAMA
5368af4847 replace tabs to spaces (#16795) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:15:43 +00:00
Jean-Philippe Lang
1fd5346c3c Fixed that Member#destroy triggers after_destroy callbacks twice (#16795). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 09:55:39 +00:00
Jean-Baptiste Barth
1914d1a159 Improve performance of Principal.member_of scope 
The 'join' turns to be slow for large numbers of members (>20k). Using a
sub-query like in Principal.not_member_of is more efficient and performance
is the same for smaller values.


git-svn-id: http://svn.redmine.org/redmine/trunk@13139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-19 21:17:55 +00:00
Toshi MARUYAMA
a87cc86b99 fix typo of app/models/repository/mercurial.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13129 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-03 23:21:01 +00:00
Toshi MARUYAMA
6eaba1137a fix typo of app/models/repository/cvs.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-03 23:20:45 +00:00