Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity
11,834 Commits 35 Branches 228 Tags
3.1.2
Commit Graph

5750 Commits

Author SHA1 Message Date
Jean-Philippe Lang
40ba35f6c2 Merged r14856 (#21155). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-11 07:22:21 +00:00
Jean-Philippe Lang
1c97ce41ff Merged r14794 (#21136). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 09:05:46 +00:00
Jean-Philippe Lang
bff6ff9273 Merged r14795 and r14796 (#21150). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14837 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-08 08:54:15 +00:00
Jean-Philippe Lang
5d9b4f1b21 Merged r14753 (#21085). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14807 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:21:57 +00:00
Jean-Philippe Lang
521910d430 Merged r14754 (#21076). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14806 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:21:13 +00:00
Jean-Philippe Lang
08390b2f58 Merged r14671 (#20992). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14804 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:19:40 +00:00
Jean-Philippe Lang
53a6e66da6 Merged r14758 (#21071). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14802 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:18:10 +00:00
Jean-Philippe Lang
d5dcab376e Merged r14670 (#20677). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14799 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-11-07 08:10:23 +00:00
Jean-Philippe Lang
387dc4df0a Merged r14658 (#20380). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14659 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:21:14 +00:00
Jean-Philippe Lang
671d044f37 Merged r14654 (#20380). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14655 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:06:18 +00:00
Jean-Philippe Lang
6f885a5b04 Merged r14618 (#20360). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 06:41:39 +00:00
Jean-Philippe Lang
46b877296a Merged r14619 (#20282). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14649 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 06:36:58 +00:00
Jean-Philippe Lang
c6de5a58da Merged r14602 (#20733). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-19 07:31:55 +00:00
Toshi MARUYAMA
6e20121bb1 Merged r14405 from trunk to 3.1-stable (#11253, #20456) 
Don't display estimated hours when nil and total is 0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14596 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-16 03:52:20 +00:00
Jean-Philippe Lang
e9c144c7de Merged r14560 and r14561 (#19577). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14562 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:43:50 +00:00
Jean-Philippe Lang
d5bb0e8593 Merged r14554 (#20688). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14558 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 14:53:28 +00:00
Jean-Philippe Lang
637ec7e883 Merged r14508 (#20512). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14556 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:48:51 +00:00
Jean-Philippe Lang
f63aea386e Merged r14552 (#20633). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14553 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:31:21 +00:00
Jean-Philippe Lang
d3a2485467 Merged r14550 (#20490). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 11:12:18 +00:00
Jean-Philippe Lang
2103844571 Merged r14499 (#20454). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14548 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:58:28 +00:00
Jean-Philippe Lang
2a15166f9b Merged r14472 (#20427). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14546 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:54:45 +00:00
Jean-Philippe Lang
1dbb256293 Merged r14473 (#20278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14543 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:51:25 +00:00
Toshi MARUYAMA
672f0e4195 3.1-stable: revert r14300 (#16535, #20466) 
Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14539 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 07:20:29 +00:00
Toshi MARUYAMA
6ad6dd2b35 Merged r14413 from trunk to 3.1-stable (#20243, #20456) 
Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods.

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14538 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 05:22:59 +00:00
Toshi MARUYAMA
7cc8aa756d Merged r14409 from trunk to 3.1-stable (#11253, #20456) 
Fixes methods comments.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14536 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:44 +00:00
Toshi MARUYAMA
8e84df24ea Merged r14408 from trunk to 3.1-stable (#11253, #20456) 
Limit queries to given issues only.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14535 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:34 +00:00
Toshi MARUYAMA
925db0c28f Merged r14407 from trunk to 3.1-stable (#11253, #20456) 
Preload total spent time on the issue list with 1 query.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14534 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:23 +00:00
Toshi MARUYAMA
74be675c94 Merged r14406 from trunk to 3.1-stable (#11253, #20456) 
Adds "Total spent hours" column available on the issue list.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:12 +00:00
Jean-Philippe Lang
bffee57744 Merged r14450 (#20206). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-25 08:54:25 +00:00
Jean-Philippe Lang
5058a99d9c Merged r14448 (#5770). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14449 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-24 04:07:24 +00:00
Jean-Philippe Lang
b54924d48b Merged r14388 (#19842). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14403 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-05 10:34:02 +00:00
Jean-Philippe Lang
5a76b558ae Merged r14389 (#20203). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-05 10:29:59 +00:00
Jean-Philippe Lang
3834b3d2ef Upgrade jquery_ujs from 3.1.1 to 3.1.3. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 09:07:12 +00:00
Jean-Philippe Lang
818e3fe01d Fixed group sorted scope order (#20066). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14380 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 08:39:31 +00:00
Jean-Philippe Lang
bf2547db20 Add avatar and edit link to "My account" page (#5418). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14377 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 09:46:18 +00:00
Jean-Philippe Lang
bc9ca5fcfd Disallow users to delete a version referenced by a custom field (#20159). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 09:02:24 +00:00
Jean-Philippe Lang
b3aaabcb3c Sort journals by created_on then id (#14881). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 07:11:41 +00:00
Jean-Philippe Lang
0dd95cdbc5 Fixed test failure introduced by r14366. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14368 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 19:28:38 +00:00
Jean-Philippe Lang
4f8f580906 Removed unused view. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14367 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 18:53:39 +00:00
Jean-Philippe Lang
89edc4dd39 Sort members on all their roles. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 18:43:12 +00:00
Jean-Philippe Lang
3036eaba52 Replace tabs with spaces and remove trailing tabs in several files (#20140). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14365 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-21 16:38:29 +00:00
Jean-Philippe Lang
59c9a071a8 Removed extra blank lines (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14346 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 20:45:18 +00:00
Jean-Philippe Lang
278468c0c8 Adds a UI test (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14345 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 20:42:33 +00:00
Jean-Philippe Lang
c92a343951 Removed extra blank lines (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14343 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 20:20:53 +00:00
Jean-Philippe Lang
a890215b51 Fixed wrong password rendering broken by r14339 (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14341 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 20:12:24 +00:00
Jean-Philippe Lang
f11bba5537 Fixed the sudo dialog when called from a dialog, eg. email addresses (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14339 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 19:56:52 +00:00
Jean-Philippe Lang
8541775549 Use existing label for password submission (#19851). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 19:19:39 +00:00
Jean-Philippe Lang
d6f389658b Require password re-entry for sensitive actions (#19851). 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14333 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-19 18:41:10 +00:00
Jean-Philippe Lang
3811ff5d95 Deprecates Project#member_principals. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-18 19:12:17 +00:00
Jean-Philippe Lang
ba61b13008 Prevent roles loading on each call to User#managed_roles for admins. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-17 18:36:38 +00:00