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

11814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
113e620ec8 Merged r14698 from trunk to 3.1-stable (#20785, #21030) 
Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14701 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-20 11:59:41 +00:00
Toshi MARUYAMA
0046966131 Merged r14696 from trunk to 3.1-stable (#20791) 
Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14697 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-20 10:45:14 +00:00
Jean-Philippe Lang
88fd9608ed Merged r14662 (#20730). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14663 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-10-09 07:36:25 +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
d690cff576 Merged r14606. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14607 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-20 06:18:15 +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
793c448370 Merged r14598 from trunk to 3.1-stable (#20761) 
fix typo of Japanese translation for notice_gantt_chart_truncated.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14599 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-16 10:49:18 +00:00
Toshi MARUYAMA
19793ad508 Merged r14584 from trunk to 3.1-stable (#20731) 
Japanese "spent time" translation changed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14597 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-16 05:49:06 +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
Toshi MARUYAMA
8ca735ae68 Merged r14588 from trunk to 3.1-stable (#20728, #20747) 
Portuguese translation for 3.1-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14592 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 14:08:37 +00:00
Toshi MARUYAMA
12d49e155e Merged r14587 from trunk to 3.1-stable (#20728, #20746) 
Portuguese translation for 3.0-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14591 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 14:08:26 +00:00
Toshi MARUYAMA
ea5505e4b0 Merged r14586 from trunk to 3.1-stable (#20728, #20745) 
Portuguese translation for 2.6-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14590 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 14:08:15 +00:00
Toshi MARUYAMA
5e7873d154 Merged r14582 from trunk to 3.1-stable (#20729) 
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14583 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 10:14:55 +00:00
Toshi MARUYAMA
abf7dbb4b4 3.1-stable: fix Czech textile ol example (#20452) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14572 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 06:09:51 +00:00
Jean-Philippe Lang
1c8cca9270 Merged r14480 (#20735). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14565 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:50:32 +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
c672f43a65 Adds translation strings (#20688). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14559 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 14:54:37 +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
1e026442f1 Merged r14475 (#20407). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14545 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:53:22 +00:00
Jean-Philippe Lang
558a30f950 Merged r14474 (#20401). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14544 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 10:52:37 +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
6ce8c55a5c Merged r14410 from trunk to 3.1-stable (#11253, #20456) 
Asserts that spent time is preloaded.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14537 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 03:38:55 +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
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