Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-23 04:40:42 +01:00
Code Issues Packages Projects Releases Activity
9,744 Commits 35 Branches 228 Tags
2.3-stable
Commit Graph

1438 Commits

Author SHA1 Message Date
Toshi MARUYAMA
292cf40100 Merged r12456 from trunk to 2.3-stable (#15756) 
change requirement in bazaar lib as same with other scm libs.

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12459 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-24 07:18:09 +00:00
Toshi MARUYAMA
81555eb053 backport r12453 AbstractAdapter change to 2.3-stable (#15756) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12455 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-24 05:03:02 +00:00
Toshi MARUYAMA
1e10d9a9ef Merged r12387 from trunk to 2.3-stable. 
fix disable to run test environment.

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12391 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-09 06:13:24 +00:00
Toshi MARUYAMA
765ee4c62d Merged r12273 from trunk to 2.3-stable. 
Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12390 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-09 06:13:12 +00:00
Jean-Philippe Lang
3ee363a5cb Updates for 2.3.4 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-17 11:17:59 +00:00
Jean-Philippe Lang
8849727bd9 Merged r12164 from trunk (#14592). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12212 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 08:26:18 +00:00
Jean-Philippe Lang
c4eb7c380e Merged r12163 from trunk (#14590, #14592). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12211 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 08:24:48 +00:00
Toshi MARUYAMA
4deca5976e Merged r12189 from trunk to 2.3-stable (#13632) 
pdf: fix empty page attached when exporting.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12191 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-30 12:22:26 +00:00
Toshi MARUYAMA
79f90dfba5 Merged r12143 from trunk to 2.3-stable (#14931) 
scm: git: use "--encoding=UTF-8" for blame.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-19 03:25:38 +00:00
Jean-Philippe Lang
2c44829509 Updates for 2.3.3 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-14 06:47:11 +00:00
Jean-Philippe Lang
36978279c3 Merged r12076 from trunk (#14607). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12078 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-08-04 10:33:03 +00:00
Jean-Philippe Lang
e1e006f09e Merged r12017 and r12027 from trunk (#14422). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12065 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 20:48:52 +00:00
Toshi MARUYAMA
bbf3ffe0aa Merged r12046 from trunk to 2.3-stable (#14562) 
fix diff of CJK (Chinese/Japanese/Korean) is broken on Ruby 1.8.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12054 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 12:53:51 +00:00
Jean-Philippe Lang
b724eb4fec Merged r12052 from trunk (#14511). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12053 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-28 12:09:47 +00:00
Jean-Philippe Lang
8efcf60319 Updates for 2.3.2 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12023 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-14 14:50:07 +00:00
Jean-Philippe Lang
e07bc81c5e Add more info about the ruby version (#14419). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-11 18:43:48 +00:00
Jean-Philippe Lang
5c6349a7ca Merged r11905 from trunk (#14103). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-11 18:37:47 +00:00
Jean-Philippe Lang
37fbdb1457 Merged r11906 from trunk (#14101). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12000 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-11 18:37:00 +00:00
Toshi MARUYAMA
489527ada7 Merged r11925 from trunk to 2.3-stable (#13692) 
prevent coderay "warning: already initialized constant" on Ruby 1.8.7.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11929 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-06-05 04:06:47 +00:00
Toshi MARUYAMA
6ce685a63c Merged r11920 and r11921 from trunk to 2.3-stable (#14178) 
pdf: restore "col_id_width" parameter of issues_to_pdf_draw_borders.

Contributed by Massimo Rossello.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11924 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-06-04 12:42:29 +00:00
Toshi MARUYAMA
73b4b614ee Merged r11724 from trunk to 2.3-stable. 
Add TODO comment about gantt issues sort (#7335).

Sorting by date was dropped by r4581 (#7128).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11769 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-02 22:44:54 +00:00
Jean-Philippe Lang
1a71316b37 Merged r11757 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11758 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-01 15:14:28 +00:00
Jean-Philippe Lang
07dc1e34ff Merged r11748 from trunk (#13712). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11749 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-01 12:36:48 +00:00
Jean-Philippe Lang
1afe67bf74 Merged r11698 from trunk (#13541). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11747 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-01 12:17:31 +00:00
Jean-Philippe Lang
f9f4591cff Merged r11680 from trunk (#13541). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-01 12:16:56 +00:00
Toshi MARUYAMA
655c50849d Merged r11706 and r11707 from trunk to 2.3-stable (#13644) 
fix diff error in case of line_left out of range.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11709 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-04-05 09:56:14 +00:00
Etienne Massip
e189641e8c Merged r11693 from trunk (#13630). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11695 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-04-02 17:50:39 +00:00
Jean-Philippe Lang
53680edb2d Merged r11497 from trunk (#13329). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11574 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-09 10:59:22 +00:00
Jean-Philippe Lang
8245eaa9f3 Merged r11474 from trunk (#10277). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-09 09:17:37 +00:00
Jean-Philippe Lang
83430dacd9 Merged r11471 from trunk (#5329). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11565 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-09 09:15:42 +00:00
Jean-Philippe Lang
998a29cbaf Merged r11473 from trunk (#3676). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11564 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-09 09:14:22 +00:00
Toshi MARUYAMA
a4b6928a26 Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641) 
fix that diff outputs become ??? in some non ASCII words.

Contributed by Filou Centrinov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11551 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-07 21:03:55 +00:00
Toshi MARUYAMA
0e92038047 Merged r11542 from trunk to 2.3-stable. 
use %r{} instead of // at lib/redmine/unified_diff.rb.

Syntax highlight is broken in gedit 2.28.4 on CentOS 6.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11548 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-07 10:29:50 +00:00
Toshi MARUYAMA
4100d3beeb Merged r11527 from trunk to 2.3-stable (#13338, #13329) 
Ruby2.0: remove "warning: class variable access from toplevel" in lib/plugins/rfpdf/lib/tcpdf.rb.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-03-03 12:10:48 +00:00
Jean-Philippe Lang
e6d63a4e0d Merged r11459 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11460 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-24 09:22:41 +00:00
Jean-Philippe Lang
346085c5fc Set stable version. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11455 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-23 14:30:18 +00:00
Jean-Philippe Lang
998928ecdf Set version to 2.3.0. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11450 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-23 11:51:56 +00:00
Jean-Philippe Lang
59c704dcd2 Don't use iconv with ruby1.9 (#12787). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-18 21:39:17 +00:00
Jean-Philippe Lang
7799788b3d Fixed that updating the issue form was broken by r4011 when user is not allowed to add issues (#13188). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11405 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-16 11:35:18 +00:00
Toshi MARUYAMA
d5f1e186f1 not use htmlentities gem in rfpdf plugin (#13138) 
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11399 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-15 13:24:10 +00:00
Toshi MARUYAMA
52d15dd122 add "tmp:clear" to "ci:setup" rake task for new translation 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11389 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-15 06:10:40 +00:00
Jean-Philippe Lang
1faa94af8a Updates for 2.2.3 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11366 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-12 18:07:38 +00:00
Jean-Philippe Lang
514f2d6c0f Fixed that custom_field_values are not reloaded on #reload (#13119). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11349 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-11 17:38:30 +00:00
Jean-Philippe Lang
a24bf65a8b Don't run Capybara tests on the CI server (#12822). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11345 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-10 17:09:33 +00:00
Jean-Philippe Lang
856ef810b4 Bulk watch/unwatch issues from the context menu (#7159). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11339 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-10 10:31:12 +00:00
Jean-Philippe Lang
25e1842f5f Create all databases. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-03 15:46:54 +00:00
Toshi MARUYAMA
de8033d183 comment out i18n key in plugin template (#12900) 
It seems duplicate keys in plugins cause problems.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11314 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-03 08:46:40 +00:00
Toshi MARUYAMA
afc9e4784b pdf: fix broken new line in table (#11987) 
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11306 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-02-03 05:44:13 +00:00
Jean-Philippe Lang
f2fd78f7b8 Use POST instead of GET for logging out (#13022). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11289 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-30 17:34:48 +00:00
Jean-Philippe Lang
41faf7f5f5 Adds test:ui to ci:build. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-29 18:49:33 +00:00