Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 16:26:03 +01:00
Code Issues Packages Projects Releases Activity
12,701 Commits 35 Branches 222 Tags
5e4f49c8ad1eb3154dca1995c833e47e901b6e24
Commit Graph

6108 Commits

Author SHA1 Message Date
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +00:00
Jean-Philippe Lang
146af67b3c Adds a Cancel button on issue edit view (#18051). 
Patch by Marcin Świątkiewicz.

git-svn-id: http://svn.redmine.org/redmine/trunk@13477 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 20:53:07 +00:00
Jean-Philippe Lang
b01c740980 Fixed test failure with MySQL introduced by r13467. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:44:33 +00:00
Jean-Philippe Lang
51508f67d0 Fixed test failure with SQLServer introduced by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13467 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 17:47:18 +00:00
Jean-Philippe Lang
78120536b1 Fixed tests broken by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13466 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:47:43 +00:00
Jean-Philippe Lang
cac6ebb6c5 Code cleanup, removed raw SQL queries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13461 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 19:16:09 +00:00
Toshi MARUYAMA
92f2ab6b70 use deep_dup to prevent losing mail receiving options (#14491) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13457 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 04:04:38 +00:00
Jean-Philippe Lang
c4484a40c0 Use relative URL for thumbnails according to :only_path option (#18119). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13451 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-18 10:14:17 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:59:21 +00:00
Jean-Philippe Lang
85f2074aff Reverts change in r13428, project can't be found by identifier (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:24:24 +00:00
Jean-Philippe Lang
74cd72a2d9 Fixed that preview doesn't show notes when issue project is changed (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13428 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:18:55 +00:00
Jean-Philippe Lang
a567546335 Don't link multiple changesets from the same commit multiple times (#17931). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13427 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 12:10:33 +00:00
Jean-Philippe Lang
8b998ec05b Adds css classes to get sort order on the issue list (#17993). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:36:35 +00:00
Jean-Philippe Lang
2e9b28906d Removes routes for time entries nested under project/issues. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:14:17 +00:00
Jean-Philippe Lang
efdf2584b6 Adds a link to /time_entries/new from My Page Spent Time block (#17955). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13423 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:26:48 +00:00
Jean-Philippe Lang
15d5c331eb Let the new time_entry form be submitted without project (#17954). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:23:14 +00:00
Jean-Philippe Lang
7e7ac5340a Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-28 14:51:08 +00:00
Toshi MARUYAMA
5ce32798f2 rename jQuery Datepicker i18n file name 
jquery-ui renamed these files.
21154cfa2e

git-svn-id: http://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-27 05:14:53 +00:00
Jean-Philippe Lang
8ae41b4846 Ignore email keywords after truncation line (#8758). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-20 07:51:37 +00:00
Jean-Baptiste Barth
b519aba63e Expire other sessions on password change (#17796). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 21:38:54 +00:00
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