Commit Graph

6828 Commits

Author SHA1 Message Date
Jean-Philippe Lang
0db24c82a4 Merged r18015 to 4.0-stable (#31063).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18019 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-30 07:16:13 +00:00
Jean-Philippe Lang
dcbbee1c74 Merged r18013 to 4.0-stable (#30731).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-30 07:14:22 +00:00
Go MAEDA
1d6258250c Merged r18008 from trunk to 4.0-stable (#31087).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18009 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-26 14:39:58 +00:00
Go MAEDA
f3232146ac Merged r18005 from trunk to 4.0-stable (#30923).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-25 03:48:44 +00:00
Go MAEDA
bdbb89b7b3 Merged r17852 from trunk to 4.0-stable (#10264).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-17 07:08:30 +00:00
Jean-Philippe Lang
5cedc4ad35 Merged r17955 and r17956 to 4.0-stable (#26836).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:54:17 +00:00
Jean-Philippe Lang
f914aac121 Merged r17952 to 4.0-stable (#30872).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:37:15 +00:00
Jean-Philippe Lang
4833318c3d Merged r17949 to 4.0-stable (#29055).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-15 07:29:10 +00:00
Go MAEDA
9dcfff5b36 Merged r17933 from trunk to 4.0-stable (#30367).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17940 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-13 15:24:33 +00:00
Go MAEDA
24af62b16c Merged r17935 from trunk to 4.0-stable (#30985).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-09 15:22:30 +00:00
Go MAEDA
5a1b03eeaf Merged r17931 from trunk to 4.0-stable (#30977).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-06 23:23:39 +00:00
Go MAEDA
c2389242a9 Merged r17918 from trunk to 4.0-stable (#30955).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-03 22:33:24 +00:00
Go MAEDA
3ba9d27ddb Merged r17906 from trunk to 4.0-stable (#30256).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17912 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-03 01:46:24 +00:00
Go MAEDA
196f7ee83f Merged r17909 from trunk to 4.0-stable (#30939).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17910 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-03-02 03:04:57 +00:00
Go MAEDA
4f405ea0b2 Merged r17881 from trunk to 4.0-stable (#30818).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-18 15:13:02 +00:00
Go MAEDA
514e8b9112 Merged r17878 and r17879 from trunk to 4.0-stable (#30785).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17880 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-18 13:51:26 +00:00
Go MAEDA
10ad1e6006 Merged r17869 from trunk to 4.0-stable (#30718).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-16 00:35:24 +00:00
Go MAEDA
d99cbe498f Merged r17862 from trunk to 4.0-stable (#30785).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17863 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-02-13 00:09:18 +00:00
Jean-Philippe Lang
c12c77e63f Merged r17754 to 4.0-stable (#30115).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-19 11:04:09 +00:00
Jean-Philippe Lang
f460f64236 Merged r17817 to 4.0-stable (#30455).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-19 11:00:31 +00:00
Go MAEDA
9f19b7a148 Merged r17786 and r17787 from trunk to 4.0-stable (#30412).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2019-01-12 01:31:15 +00:00
Go MAEDA
c702b6275c Merged r17738 from trunk to 4.0-stable (#2635).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-16 04:20:17 +00:00
Go MAEDA
c10df9f266 Include closed projects in search for scope subprojects (#28636).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 23:21:53 +00:00
Go MAEDA
e6e02e5e45 Discourage search engines from indexing old versions of wiki pages (#29503).
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-06 00:40:39 +00:00
Go MAEDA
c9cf695ad7 Wrong columns after CSV export (#26785).
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17686 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-04 09:23:18 +00:00
Go MAEDA
21d5bb33a2 Use sorted instead of sort (#29406).
Patch by Pavel Rosický.


git-svn-id: http://svn.redmine.org/redmine/trunk@17685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 22:31:44 +00:00
Go MAEDA
7de281e904 Fix for r17683: s/button_search/label_search/ (#26620).
git-svn-id: http://svn.redmine.org/redmine/trunk@17684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 15:31:48 +00:00
Go MAEDA
75432d4cd4 Change the text of the submit button on search page from button_submit to label_search (#26620).
Patch by Dmitry Lisichkin.


git-svn-id: http://svn.redmine.org/redmine/trunk@17683 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 14:15:12 +00:00
Jean-Philippe Lang
3ba51f205d Let admins unarchive the project when trying to access an archived project (#29993).
git-svn-id: http://svn.redmine.org/redmine/trunk@17682 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 11:23:10 +00:00
Jean-Philippe Lang
12d1372ae5 Let admin users unarchive subprojects of archived projects (#29993).
git-svn-id: http://svn.redmine.org/redmine/trunk@17681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 11:13:28 +00:00
Jean-Philippe Lang
8dd6874a6a Moves some action links on the wiki page to a dropdown menu (#26575).
git-svn-id: http://svn.redmine.org/redmine/trunk@17678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 07:34:36 +00:00
Go MAEDA
05289f6002 Replace cancel button with cancel link in modals (#28662).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-02 06:24:21 +00:00
Go MAEDA
f0050f04b1 Adds view_projects_copy_only_items hook (#28895).
Patch by Jens Krämer.


git-svn-id: http://svn.redmine.org/redmine/trunk@17670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-12-01 10:03:34 +00:00
Jean-Philippe Lang
370f8660fb Restore History link at the top of a wiki page (#26575).
git-svn-id: http://svn.redmine.org/redmine/trunk@17660 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-29 16:36:36 +00:00
Jean-Philippe Lang
4f8b039ef6 CSV importer ignores shared version names of other projects (#30001).
Patch by Yuuki NARA and Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@17658 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-29 16:06:30 +00:00
Jean-Philippe Lang
c30a8a44aa Related issues section ignores the date format setting (#29918).
Patch by Mizuki ISHIKAWA.

git-svn-id: http://svn.redmine.org/redmine/trunk@17656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-29 15:51:16 +00:00
Go MAEDA
6a12b5839b Add wiki class also for half width custom fields with text formatting enabled (#30027).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17634 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-26 00:23:08 +00:00
Go MAEDA
ef6d0dd355 Remove trailing whitespaces from app/helpers/issues_helper.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@17633 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-26 00:21:28 +00:00
Go MAEDA
f743d2356f Fix: Attachments are added even if validation fails when updating an issue via email (#28576).
Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@17630 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-23 06:07:32 +00:00
Go MAEDA
54cfb7b75e Sort issues by due date in email reminders (#29771).
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17624 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-06 03:13:46 +00:00
Go MAEDA
9ebd94c72e Remove trailing whitespaces from app/models/mailer.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@17622 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-06 02:44:04 +00:00
Go MAEDA
45ea5bc0d9 Add missing closing tag in app/views/roles/_form.html.erb (#29912).
Patch by Vincent Robert.


git-svn-id: http://svn.redmine.org/redmine/trunk@17621 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-05 13:40:15 +00:00
Go MAEDA
ce7931a956 Previous/Next link on repository page disappears when switching to "View differences" tab (#26576, #29730).
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17620 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-05 02:40:04 +00:00
Go MAEDA
2f1c9f5411 Move attachments to their own section in issue page (#29033).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-11-04 07:26:29 +00:00
Go MAEDA
dced476200 Hide "Files" section in wiki pages when printing (#29791).
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17614 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-31 07:16:52 +00:00
Go MAEDA
89f026e638 Remove trailing whitespaces from app/views/wiki/show.html.erb
git-svn-id: http://svn.redmine.org/redmine/trunk@17613 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-31 07:15:19 +00:00
Go MAEDA
5f96648717 Use Project::STATUS_ACTIVE constant instead of harcoded 1 (#29449).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-29 07:01:51 +00:00
Go MAEDA
bae9ffd327 Filter out issues from closed projects in the following widgets (#29449):
* Issues assigned to me
* Reported issues
* Watched issues

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17611 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-29 06:14:56 +00:00
Go MAEDA
f62b46def8 Revert unwanted changes in r17607 (#20081).
git-svn-id: http://svn.redmine.org/redmine/trunk@17609 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-29 05:00:04 +00:00
Go MAEDA
a0479c768e Filter time entries after project status (#20081).
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17608 e93f8b46-1217-0410-a6f0-8f06a7374b81
2018-10-29 04:05:18 +00:00