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

4552 Commits

Author SHA1 Message Date
Jean-Philippe Lang
e04ff6feda Merged r15959 (#24311). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16047 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-03 08:42:06 +00:00
Jean-Philippe Lang
6ebb700db2 Merged r15955 and r15956 (#24297). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15999 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 08:58:41 +00:00
Jean-Philippe Lang
6501e1451a Merged r15890 (#24014). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-09 08:39:37 +00:00
Jean-Philippe Lang
52b19aca3c Merged r15879 (#23969). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15889 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-08 07:05:15 +00:00
Jean-Philippe Lang
31825ff1ee Merged r15856 (#23376). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:22:30 +00:00
Jean-Philippe Lang
dce9b21f3f Merged r15857 (#23878). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15876 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:21:45 +00:00
Jean-Philippe Lang
87e36462d6 Merged r15855 (#23766). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15875 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:21:02 +00:00
Jean-Philippe Lang
3fa2f52532 Merged r15848 (#23764). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:18:53 +00:00
Jean-Philippe Lang
c6e20372fd Merged r15846 (#23841). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:12:19 +00:00
Jean-Philippe Lang
2f37af1225 Merged r15852 and r15863 (#23839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15864 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:07:03 +00:00
Toshi MARUYAMA
50a8e40cbe Merged r15512 from trunk to 3.3-stable (#22951, #23558) 
Include required module.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15828 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 15:01:48 +00:00
Toshi MARUYAMA
49fcc1b3e9 Merged r15511 from trunk to 3.3-stable (#22951, #23558) 
Set default language in import tests.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15824 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 14:25:24 +00:00
Jean-Philippe Lang
1e4678b9ae Merged r15816 (#23758). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-04 17:11:10 +00:00
Toshi MARUYAMA
ceeca4a88d 3.3-stable: fix test failure (#23700) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15793 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-01 05:44:50 +00:00
Jean-Philippe Lang
a545fa41cb Merged r15775 and r15776 (#23346). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 17:10:14 +00:00
Jean-Philippe Lang
9f8053a82e Merged r15749 (#23700). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:56:31 +00:00
Jean-Philippe Lang
62f9b56c1e Merged r15751 (#23596). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15770 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:55:53 +00:00
Jean-Philippe Lang
e9370c3fce Merged r15740 and r15748 (#23410). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15768 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:54:24 +00:00
Jean-Philippe Lang
d20f2a7def Merged r15750 (#23655). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15765 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:51:20 +00:00
Jean-Philippe Lang
e8afae7cbc Merged r15586 (#23172). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15743 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 11:45:49 +00:00
Jean-Philippe Lang
f231779252 Merged r15609 (#23278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-11 18:09:54 +00:00
Jean-Philippe Lang
e75926314f Merged r15587 and r15588 (#23180). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15619 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:54:29 +00:00
Jean-Philippe Lang
0804245614 Merged r15610 and r15611 (#23242). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15617 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:51:52 +00:00
Jean-Philippe Lang
0b67170baf Merged r15607 (#23246). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15614 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:46:52 +00:00
Jean-Philippe Lang
723857fc42 Merged r15608 (#23206). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:45:46 +00:00
Jean-Philippe Lang
11b7b573df Merged r15547 and r15561 (#23020). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:57:22 +00:00
Jean-Philippe Lang
1f79610fdc Merged r15536 and r15541 (#23083). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:18:40 +00:00
Jean-Philippe Lang
5169055276 Merged r15539 and r15550 (#23067). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15557 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:16:43 +00:00
Jean-Philippe Lang
26ec2cdc07 Merged r15540 (#285). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15542 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 06:46:55 +00:00
Jean-Philippe Lang
89cfe130fc Merged r15532 to r15534 (#23054). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15537 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 06:01:43 +00:00
Jean-Philippe Lang
6c3fc8c380 Merged r15510 (#22123). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15514 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-12 06:02:55 +00:00
Jean-Philippe Lang
748fd10893 Merged r15501 to r15508 (#15880). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-12 05:50:26 +00:00
Jean-Philippe Lang
8516e1c88d Merged r15490 to r15493, r15496, r15497 (#22951). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-11 05:25:46 +00:00
Jean-Philippe Lang
6e68d008c4 Merged 15430, 15464 to 15469, 15475, 15476 (#285, #7839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-06 09:41:50 +00:00
Jean-Philippe Lang
cdfebdcec8 Merged r15442 (#22898). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 09:56:44 +00:00
Jean-Philippe Lang
8c09e330d4 Merged r15431 to r15435 (#22924, #22925, #22926). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:24:45 +00:00
Jean-Philippe Lang
961c0e0de9 Merged r15429 (#22911). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:19:20 +00:00
Jean-Philippe Lang
14beafcc24 Malformed SQL query with SQLServer when grouping and sorting by fixed version (#22808). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15416 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-16 07:03:14 +00:00
Jean-Philippe Lang
7d6b3d344d Add support for attaching file to WIKI pages by REST API (#14830). 
Patch by Takenori TAKAKI.

git-svn-id: http://svn.redmine.org/redmine/trunk@15415 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-16 06:29:52 +00:00
Jean-Philippe Lang
0e59482e90 Include private_notes property in xml/json Journals output (#20985). 
Patch by Takenori TAKAKI.

git-svn-id: http://svn.redmine.org/redmine/trunk@15414 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-16 06:25:11 +00:00
Jean-Philippe Lang
4019ba76ab Restores the "New issue" tab in the project menu and makes it optional (#6204). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15407 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-09 17:16:55 +00:00
Jean-Philippe Lang
60bb7565dd Include value and label of possible values in custom fields API (#22745). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15401 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 08:44:53 +00:00
Jean-Philippe Lang
b553b23e6b Show attachment view even is no preview is available (#22482). 
Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15398 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 08:04:51 +00:00
Jean-Philippe Lang
3d2c198c0f Add view for "no preview" repository files (#22482). 
Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15397 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 08:02:23 +00:00
Jean-Philippe Lang
d8d23fbb6b Add basic test for image view (#22482). 
Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 07:40:59 +00:00
Jean-Philippe Lang
8cbfeddeb0 Child nodes should only be rendered if the user is actually authorized to see them (#15880). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@15393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-08 06:48:36 +00:00
Jean-Philippe Lang
9cfb319c43 Test failure with SQLServer (#22320). 
git-svn-id: http://svn.redmine.org/redmine/trunk@15392 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-07 18:30:59 +00:00
Jean-Philippe Lang
eafd585dbe Fixes Query#date_clause timezone handling (#22320). 
When querying time fields based on date values these should be interpreted
in the user's time zone, since that's what a user usually expects.

Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-07 10:58:49 +00:00
Jean-Philippe Lang
ed50d42210 Replace Date.today with User.current.today (#22320). 
Depending on the offset between a user's configured timezone and the server
timezone, Date.today may be more or less often wrong from the user's
perspective, leading to things like issues marked as overdue too early or too
late, or yesterday / tomorrow being displayed / selected where 'today' is
intended.

A test case illustrating the problem with Issue#overdue? is included

Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15379 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-07 10:42:22 +00:00
Jean-Philippe Lang
40c9c3e922 Notify the user of missing attachments (#22401). 
under certain (rare) circumstances it may happen that, when an issue or other
container is saved, added attachments have already been removed (i.e. by the
attachments:prune rake task). This patch adds a validation error to the
container in this case.

Patch by Jens Kraemer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15378 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-05-07 10:31:20 +00:00