Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-31 17:50:57 +02:00
Code Issues Packages Projects Releases Activity
14,232 Commits 35 Branches 228 Tags
aecd1b331eed0c416f2479eb6b481a7e780ec4e5
Commit Graph

2723 Commits

Author SHA1 Message Date
Go MAEDA
32ff4805e0 Merged r20970 from trunk to 4.0-stable (#35045). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20973 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2021-04-25 13:32:28 +00:00
Go MAEDA
9e78df79cc Merged r20946 from trunk to 4.0-stable (#34367). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2021-04-19 23:43:37 +00:00
Go MAEDA
d4edf7cda6 Merged r20783 from trunk to 4.0-stable (#33548). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20785 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2021-03-14 06:59:31 +00:00
Go MAEDA
a606f95883 Merged r20693 from trunk to 4.0-stable (#34297). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20696 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-12-29 07:07:54 +00:00
Go MAEDA
127e2dd03b Merged r18353 from trunk to 4.0-stable (#34461). 
This merge is intended to update Redcarpet from 3.4 to 3.5 before merging r20665 which updates Redcarpet to 3.5.1.


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20667 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-12-18 05:13:58 +00:00
Go MAEDA
dd73415d53 Merged r20094 from trunk to 4.0-stable (#33769). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20096 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-09-30 13:57:52 +00:00
Go MAEDA
82c2c4f533 Merged r19999 from trunk to 4.0-stable (#33926). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20004 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-09-02 08:48:36 +00:00
Go MAEDA
565574e3be Merged r19976 from trunk to 4.0-stable (#33175). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19981 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-08-15 23:05:18 +00:00
Go MAEDA
ee1f94c7f2 Merged r19975 from trunk to 4.0-stable (#33689). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19979 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-08-15 07:49:52 +00:00
Go MAEDA
1f501b7b74 Merged r19935 from trunk to 4.0-stable (#33140). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19937 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-07-25 08:55:25 +00:00
Go MAEDA
61532dde04 Merged r19818 from trunk to 4.0-stable (#33576). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19820 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-06-14 07:00:46 +00:00
Toshi MARUYAMA
0e321e6a86 Merged r19333 from trunk to 4.0-stable (#25742) 
Filter all possibly class values on code tags in Textile.

Contributed by Holger Just from Planio.

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-12-05 12:05:12 +00:00
Jean-Philippe Lang
70d4865b1c Merged r17741 to 4.0-stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19081 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-16 11:36:00 +00:00
Jean-Philippe Lang
e9322b9057 Merged r18743 to 4.0-stable (#31779). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18744 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-10-19 08:37:16 +00:00
Go MAEDA
2e71eda8c1 Merged r17761 from trunk to 4.0-stable (#32022). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-09-05 05:58:15 +00:00
Go MAEDA
d7e0394eb5 Merged r18356 from trunk to 4.0-stable (#31778). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18359 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-08-09 09:37:07 +00:00
Go MAEDA
dc8be287b0 Merged r18269 from trunk to 4.0-stable in order to revert r18246 (#31582, #31365). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-20 07:06:30 +00:00
Jean-Philippe Lang
ce7175f9f0 Merged r18245 to 4.0-stable (#31365). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-10 11:41:31 +00:00
Go MAEDA
bd8d4feed0 Backport the fix r18239 to 4.0-stable (#31503). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18240 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-06-10 02:07:46 +00:00
Go MAEDA
68ccc4a8ac Merged r17889 from trunk to 4.0-stable (#30811). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18129 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-05 02:02:38 +00:00
Go MAEDA
5b5298bac0 Merged r18122 from trunk to 4.0-stable (#29259). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18123 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-04 10:26:31 +00:00
Go MAEDA
b4562c3989 Merged r18118 from trunk to 4.0-stable (#31285). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18119 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-03 11:13:15 +00:00
Go MAEDA
002d065fe8 Merged r18103 from trunk to 4.0-stable (#31276). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18104 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-04-30 03:29:50 +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
Jean-Philippe Lang
956eb1b7fa Merged r17966 to 4.0-stable (#31030). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17967 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 09:50:31 +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
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
4bb955c482 Merged r17868 from trunk to 4.0-stable (#30718). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17871 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-02-16 00:34:02 +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
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
592dd6f35f Merged r17764 from trunk to 4.0-stable (#30171). 
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-17 23:44:47 +00:00
Jean-Philippe Lang
4cba8d9599 Tests broken for SQLite3 (#30119). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17697 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-08 06:40:29 +00:00
Go MAEDA
8a0a3bc8ed Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17689 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-06 00:34:21 +00:00
Go MAEDA
91f788854d Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17688 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-04 10:29:56 +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
3c423df203 Don't send notifications when using Issue.generate! in tests in order to speed up tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17680 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-02 08:36:14 +00:00
Jean-Philippe Lang
0e9837e4d1 Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17679 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-02 07:54:49 +00:00
Jean-Philippe Lang
4ce9de94bc Tests failure with SQLite3. 
ActiveRecord::RecordNotUnique: SQLite3::ConstraintException: UNIQUE constraint failed: custom_fields_trackers.custom_field_id, custom_fields_trackers.tracker_id: INSERT INTO "custom_fields_trackers" ("custom_field_id", "tracker_id") VALUES (?, ?)

git-svn-id: http://svn.redmine.org/redmine/trunk@17675 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-01 12:38:16 +00:00
Jean-Philippe Lang
4f5f1f3945 Tests failure with SQLite3. 
ActiveRecord::RecordNotUnique: SQLite3::ConstraintException: UNIQUE constraint failed: custom_fields_trackers.custom_field_id, custom_fields_trackers.tracker_id: INSERT INTO "custom_fields_trackers" ("custom_field_id", "tracker_id") VALUES (?, ?)

git-svn-id: http://svn.redmine.org/redmine/trunk@17674 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-01 12:35:45 +00:00
Jean-Philippe Lang
6309131c13 Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17671 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-01 11:25:30 +00:00
Go MAEDA
e23b2023cb Allow single Chinese character as a search keyword (#30037). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17667 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-30 15:42:30 +00:00
Jean-Philippe Lang
198212f991 Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17666 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 22:20:14 +00:00
Jean-Philippe Lang
1cadb28a6e Current user should be nil to prevent ActiveJob::DeserializationError errors in tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@17665 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 19:24:30 +00:00
Jean-Philippe Lang
0fac1a5440 Adds a test for #30001. 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@17659 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 16:06:52 +00:00
Go MAEDA
9b682c2537 Add missing fixtures for test_create_should_send_notification (#29990). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17648 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 06:52:33 +00:00
Jean-Philippe Lang
4770fa5b6a Tests for #29674. 
Patch by Takenori TAKAKI.

git-svn-id: http://svn.redmine.org/redmine/trunk@17646 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-28 18:15:56 +00:00
Jean-Philippe Lang
f130bf9e2b REST API with JSON content missing false values (#20788). 
Patch by Yuichi HARADA.

git-svn-id: http://svn.redmine.org/redmine/trunk@17643 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-28 18:03:07 +00:00
Go MAEDA
14d441a144 Remove blank keys from sort criteria (#30009). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17638 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 05:22:04 +00:00
Go MAEDA
7fbcb8c908 Tags start with 'pre' are handled as 'pre' tag in Textile (#8395). 
Patch by Takenori TAKAKI and Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@17636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 04:40:09 +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