Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-01 20:30:11 +01:00
Code Issues Packages Projects Releases Activity
11,780 Commits 35 Branches 225 Tags
925db0c28fcb7d4e5eae3af3861bfbc1c0d5d7c2
Commit Graph

11780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Toshi MARUYAMA
a76912b46b Merged r14416 and r14530 from trunk to 3.1-stable 
travis: add PostgreSQL environments

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14531 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 05:05:49 +00:00
Toshi MARUYAMA
225669d3c7 Merged r14525 from trunk to 3.1-stable 
travis: allow test failures on MySQL 5.7

<pre>
ActiveRecord::StatementInvalid: Mysql2::Error:
  Table 'performance_schema.session_variables' doesn't exist:
  SHOW VARIABLES LIKE 'character_set_database'
</pre>

Refer:

* https://github.com/rails/rails/issues/21108
* https://github.com/rails/rails/pull/21318

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14526 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 23:18:40 +00:00
Toshi MARUYAMA
e7780ea069 Merged r14521 from trunk to 3.1-stable 
Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14524 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 09:53:49 +00:00
Toshi MARUYAMA
b382f13694 Merged r14415 and r14522 from trunk to 3.1-stable (#20251) 
travis: allow ui test failure.

Refer:
https://github.com/travis-ci/travis-ci/issues/3225

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14523 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 07:21:52 +00:00
Toshi MARUYAMA
06de840895 Merged r14517 from trunk to 3.1-stable (#20452) 
Czech translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14518 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 15:09:29 +00:00
Toshi MARUYAMA
8a7e875650 3.1-stable: Czech wiki help translation updated by Karel Pičman (#20452) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14516 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 14:54:12 +00:00
Toshi MARUYAMA
73a8a2f7fc Merged r14513 from trunk to 3.1-stable (#20452, #20557) 
Czech translation for 2.6-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14514 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 13:44:29 +00:00
Toshi MARUYAMA
8d0a14b605 Merged r14461 from trunk to 3.1-stable (#20338, #20410) 
Turkish translation for 3.1-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14464 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-26 14:05:44 +00:00
Toshi MARUYAMA
5910f01fd3 Merged r14460 from trunk to 3.1-stable (#20338, #20409) 
Turkish translation for 3.0-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14463 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-26 14:05:33 +00:00
Toshi MARUYAMA
d699366e29 Merged r14459 from trunk to 3.1-stable (#20338, #20408) 
Turkish translation for 2.6-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14462 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-26 14:05:22 +00:00
Jean-Philippe Lang
a686d7ae66 Merged r14455. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14456 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-26 07:08:09 +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
64354aa688 Merged r14451 (#20372). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14452 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-25 06:52:41 +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
b8d7ff080c Merged r14446 (#16373). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14447 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-24 04:05:11 +00:00
Toshi MARUYAMA
74aac50c8f Merged r14443 from trunk to 3.1-stable (#19172) 
doc/INSTALL: update requirements Bundler >= 1.5.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-13 04:09:13 +00:00
Toshi MARUYAMA
4e371042f9 Merged r14440 from trunk to 3.1-stable (#20292) 
add config/secrets.yml to .gitignore and .hgignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14441 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 10:45:12 +00:00
Toshi MARUYAMA
63851c5ba0 Merged r14437 from trunk to 3.1-stable (#20292) 
add config/secrets.yml to svn:ignore.

Contributed by Benjamin Petersen.



git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 10:15:47 +00:00
Toshi MARUYAMA
f7e60a0313 Merged r14430 from trunk to 3.1-stable (#20199) 
Russian translation for 3.1-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 09:37:12 +00:00
Toshi MARUYAMA
892d0e1d8c Merged r14429 from trunk to 3.1-stable (#20199, #20295) 
Russian translation for 3.0-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 09:37:00 +00:00
Toshi MARUYAMA
6db2a468b5 Merged r14428 from trunk to 3.1-stable (#20199, #20294) 
Russian translation for 2.6-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-12 09:36:49 +00:00
Toshi MARUYAMA
da95a1b5d6 Merged r14420 from trunk to 3.1-stable (#20198) 
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-07 11:25:44 +00:00
Toshi MARUYAMA
84a44d9998 Merged r14419 from trunk to 3.1-stable (#20193) 
Bulgarian translation updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14421 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-07 11:25:33 +00:00
Toshi MARUYAMA
bcae2a41be Merged r14417 from trunk to 3.1-stable. 
add missing fixtures to IssueSubtaskingTest.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14418 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-06 16:17:27 +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
d7230643c8 Merged r14396 (#17757). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14397 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-05 10:23:12 +00:00
Toshi MARUYAMA
3902c5cf24 Merged r14394 from trunk to 3.1-stable (#19993) 
change csv separators of es-PA.yml by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-04 05:17:39 +00:00
Toshi MARUYAMA
41fb1bd0f8 Merged r14392 from trunk to 3.1-stable (#19993) 
Spanish (es, es-PA) translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-07-02 10:06:28 +00:00
Jean-Philippe Lang
3d4dd69703 Set BRANCH to stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14387 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 10:05:06 +00:00
Jean-Philippe Lang
952d69c00a Merged r14380 (#20066). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14385 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 10:00:53 +00:00
Jean-Philippe Lang
cf85562599 Merged r14381. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14382 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 09:18:49 +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
4cc7fa36c1 Added 3.1-stable branch. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14379 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 07:44:53 +00:00
Jean-Philippe Lang
27895ec8d2 Set version to 3.1.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14378 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-28 07:44:28 +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
5b1fb525b8 Error when using views/issues/index.api.rsb in a plugin (#13924). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14375 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 08:04:21 +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
3602963ee4 Missing member_roles fixture (#20174). 
Patch by Vincent Robert.

git-svn-id: http://svn.redmine.org/redmine/trunk@14373 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 06:53:19 +00:00
Jean-Philippe Lang
481f9117d7 Make the updateIssueFrom(url) function return the XMLHttpRequest object (#20180). 
Patch by Vincent Robert.

git-svn-id: http://svn.redmine.org/redmine/trunk@14372 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-27 06:50:25 +00:00
Toshi MARUYAMA
58a8130394 Gemfile: update Rails to 4.2.3 
git-svn-id: http://svn.redmine.org/redmine/trunk@14370 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-26 12:37:25 +00:00
Toshi MARUYAMA
5f748cabae Traditional Chinese translation updated by ChunChang Lo (#20147) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14369 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-06-22 08:03:25 +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