source.dussan.org Git - redmine.git/log

Toshi MARUYAMA [Sat, 5 Dec 2015 04:17:05 +0000 (04:17 +0000)]

3.0-stable: backport appveyor.yml

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14925 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 5 Dec 2015 04:16:54 +0000 (04:16 +0000)]

Merged r14888 from trunk to 3.0-stable (#21328)

pdf: fix Vietnamese Italic is not shown.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14924 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:52:44 +0000 (12:52 +0000)]

Merged r14913 (#21419).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14922 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:49:24 +0000 (12:49 +0000)]

Merged r14892 (#21312).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14918 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:47:12 +0000 (12:47 +0000)]

Merged r14883 (#16948).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14915 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 14 Nov 2015 08:50:12 +0000 (08:50 +0000)]

Updates for 3.0.6 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14869 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Wed, 11 Nov 2015 07:35:24 +0000 (07:35 +0000)]

Merged r14863 (#6969).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14865 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Wed, 11 Nov 2015 07:23:07 +0000 (07:23 +0000)]

Merged r14856 (#21155).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14861 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 09:06:32 +0000 (09:06 +0000)]

Merged r14794 (#21136).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14842 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 08:56:55 +0000 (08:56 +0000)]

Merged r14795 and r14796 (#21150).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14838 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 08:50:41 +0000 (08:50 +0000)]

Merged r14812 (#6969).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14835 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 7 Nov 2015 11:07:14 +0000 (11:07 +0000)]

Merged r14813 from trunk to 3.0-stable (#20591, #20811)

update rbpdf version to 1.18.7.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14815 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:18:36 +0000 (08:18 +0000)]

Merged r14758 (#21071).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14803 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:12:03 +0000 (08:12 +0000)]

Merged r14670 (#20677).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14800 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 29 Oct 2015 16:47:47 +0000 (16:47 +0000)]

Merged r14761 from trunk to 3.0-stable (#20911, #21105)

Japanese wiki_syntax_detailed_textile.html translation for 3.0-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14764 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 29 Oct 2015 16:47:36 +0000 (16:47 +0000)]

Merged r14365 only public/help/ja/wiki_syntax_detailed.html to 3.0-stable (#20911, #21105)

Replace tabs with spaces and remove trailing tabs in several files.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14763 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 12:01:26 +0000 (12:01 +0000)]

Merged r14699 from trunk to 3.0-stable (#20785, #21031)

Polish translation for 3.0-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14705 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 12:01:16 +0000 (12:01 +0000)]

Merged r14698 from trunk to 3.0-stable (#20785, #21030)

Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14704 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:36:46 +0000 (07:36 +0000)]

Merged r14662 (#20730).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14664 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:22:18 +0000 (07:22 +0000)]

Merged r14658 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14660 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:06:39 +0000 (07:06 +0000)]

Merged r14654 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14656 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 06:42:04 +0000 (06:42 +0000)]

Merged r14618 (#20360).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14652 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 06:37:43 +0000 (06:37 +0000)]

Merged r14619 (#20282).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14650 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 20 Sep 2015 06:14:22 +0000 (06:14 +0000)]

Updates for 3.0.5 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14605 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 16 Sep 2015 10:50:46 +0000 (10:50 +0000)]

Merged r14598 from trunk to 3.0-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.0-stable@14600 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 14:22:02 +0000 (14:22 +0000)]

Merged r14587 from trunk to 3.0-stable (#20728, #20746)

Portuguese translation for 3.0-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14594 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 14:21:51 +0000 (14:21 +0000)]

Merged r14586 from trunk to 3.0-stable (#20728, #20745)

Portuguese translation for 2.6-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14593 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:36:59 +0000 (07:36 +0000)]

Merged r14517 from trunk to 3.0-stable (#20452, #20737)

Czech translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14579 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:36:47 +0000 (07:36 +0000)]

Merged r14572 from 3.1-stable to 3.0-stable (#20452, #20737)

3.1-stable: fix Czech textile ol example.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14578 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:36:36 +0000 (07:36 +0000)]

Merged r14516 from 3.1-stable to 3.0-stable (#20452, #20737)

Czech wiki help translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14577 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:36:24 +0000 (07:36 +0000)]

Merged r14365 only public/help/cs/wiki_syntax_detailed.html from trunk to 3.0-stable (#20737, #20140)

Replace tabs with spaces.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14576 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:36:13 +0000 (07:36 +0000)]

Merged r14513 from trunk to 3.0-stable (#20452, #20737)

Czech translation for 2.6-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14575 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 07:16:29 +0000 (07:16 +0000)]

3.0-stable: revert r14571 (back to Rails 4.2.3)

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14574 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 05:28:34 +0000 (05:28 +0000)]

Merged r14521 from trunk to 3.0-stable

Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14571 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 13 Sep 2015 14:51:05 +0000 (14:51 +0000)]

Merged r14480 (#20735).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14566 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 13 Sep 2015 14:44:19 +0000 (14:44 +0000)]

Merged r14560 and r14561 (#19577).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14563 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 12:49:12 +0000 (12:49 +0000)]

Merged r14508 (#20512).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14557 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:58:53 +0000 (10:58 +0000)]

Merged r14499 (#20454).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14549 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:57:22 +0000 (10:57 +0000)]

Merged r14472 (#20427).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14547 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 26 Jul 2015 14:13:16 +0000 (14:13 +0000)]

Merged r14460 from trunk to 3.0-stable (#20338, #20409)

Turkish translation for 3.0-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14466 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 26 Jul 2015 14:13:03 +0000 (14:13 +0000)]

Merged r14459 from trunk to 3.0-stable (#20338, #20408)

Turkish translation for 2.6-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14465 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 13 Jul 2015 04:10:57 +0000 (04:10 +0000)]

Merged r14443 from trunk to 3.0-stable (#19172)

doc/INSTALL: update requirements Bundler >= 1.5.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14445 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 10:47:53 +0000 (10:47 +0000)]

Merged r14440 from trunk to 3.0-stable (#20292)

add config/secrets.yml to .gitignore and .hgignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14442 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 10:28:56 +0000 (10:28 +0000)]

Merged r14437 from trunk to 3.0-stable (#20292)

add config/secrets.yml to svn:ignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14439 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 09:53:58 +0000 (09:53 +0000)]

Merged r14429 from trunk to 3.0-stable (#20199, #20295)

Russian translation for 3.0-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14435 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 09:53:47 +0000 (09:53 +0000)]

Merged r14428 from trunk to 3.0-stable (#20199, #20294)

Russian translation for 2.6-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14434 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Tue, 7 Jul 2015 19:43:38 +0000 (19:43 +0000)]

Updates for 3.0.4 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14423 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:34:16 +0000 (10:34 +0000)]

Merged r14388 (#19842).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14404 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:30:12 +0000 (10:30 +0000)]

Merged r14389 (#20203).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14401 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:23:19 +0000 (10:23 +0000)]

Merged r14396 (#17757).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14398 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 28 Jun 2015 10:01:00 +0000 (10:01 +0000)]

Merged r14380 (#20066).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14386 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 28 Jun 2015 09:19:16 +0000 (09:19 +0000)]

Merged r14381.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14383 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 26 Jun 2015 13:40:29 +0000 (13:40 +0000)]

Merged r14370 from trunk to 3.0-stable.

Gemfile: update Rails to 4.2.3.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14371 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 21 Jun 2015 09:47:36 +0000 (09:47 +0000)]

Merged r14360 from trunk to 3.0-stable (#20142)

update Gemfile to require rbpdf ~>1.18.6.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14361 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 20 Jun 2015 04:13:35 +0000 (04:13 +0000)]

Merged r14351 from trunk to 3.0-stable (#19825)

Russian translation update.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14356 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 20 Jun 2015 04:13:22 +0000 (04:13 +0000)]

Merged r14350 from trunk to 3.0-stable (#20035)

Italian translation update.

Patch by Daniele Renda.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14355 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 18 Jun 2015 07:13:50 +0000 (07:13 +0000)]

Merged r14329 from trunk to 3.0-stable (#19252)

Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.

sqlite-jdbc was updated to 3.8.10.1 in upstream.
https://github.com/jruby/activerecord-jdbc-adapter/commit/f7a20b0d577fad569d6f375d3b8f1e63dd02266b

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14330 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Wed, 17 Jun 2015 18:11:42 +0000 (18:11 +0000)]

Merged r14311 and r14312 from trunk (#19844).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14326 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 17 Jun 2015 13:54:29 +0000 (13:54 +0000)]

Merged r14319 and r14323 from trunk to 3.0-stable

* Gemfile: update Rails to 4.2.2
* Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14324 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 13 Jun 2015 11:11:10 +0000 (11:11 +0000)]

Merged r14301 (#19835).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14307 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 13 Jun 2015 11:10:22 +0000 (11:10 +0000)]

Merged r14294 (#19957).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14306 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 30 May 2015 08:24:03 +0000 (08:24 +0000)]

Merged r14284 (#19485).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14285 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 30 May 2015 08:19:10 +0000 (08:19 +0000)]

Merged r14281 (#19956).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14282 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 30 May 2015 08:10:28 +0000 (08:10 +0000)]

Merged r14267 (#19840).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14279 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 30 May 2015 08:06:31 +0000 (08:06 +0000)]

Merged r14268 (#19815).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14277 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:59:45 +0000 (07:59 +0000)]

Updates for 3.0.3 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14256 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:22:59 +0000 (07:22 +0000)]

Merged r14243 (#19793).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14251 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:22:19 +0000 (07:22 +0000)]

Merged r14239 and r14240 (#19706).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14250 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:21:39 +0000 (07:21 +0000)]

Merged r14245 (#19655).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14249 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:20:27 +0000 (07:20 +0000)]

Merged r14237 (#19735).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14248 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:19:50 +0000 (07:19 +0000)]

Merged r14241 (#19731).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14247 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 10 May 2015 07:19:06 +0000 (07:19 +0000)]

Merged r14242 (#18580).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14246 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 1 May 2015 16:57:38 +0000 (16:57 +0000)]

Merged r14235 from trunk to 3.0-stable.

prevent IssuesControllerTest#test_index_csv_big_5 fails randomly

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14236 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 30 Apr 2015 06:20:48 +0000 (06:20 +0000)]

Merged r14230 from trunk to 3.0-stable

add missing fixtures to test/unit/changeset_test.rb

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14233 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 26 Apr 2015 06:47:45 +0000 (06:47 +0000)]

Merged r14223.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14224 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 08:30:53 +0000 (08:30 +0000)]

Merged r14221 (#19570).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14222 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 08:27:24 +0000 (08:27 +0000)]

Merged r14219 (#19537).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14220 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 08:14:04 +0000 (08:14 +0000)]

Merged r14217 (#19185).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 08:01:07 +0000 (08:01 +0000)]

Merged r14215 (#19482).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14216 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:49:13 +0000 (07:49 +0000)]

Merged r14180 (#19606).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14214 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:46:50 +0000 (07:46 +0000)]

Merged r14160 (#19580).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14213 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:40:46 +0000 (07:40 +0000)]

Merged r14179 (#19569).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14210 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:39:16 +0000 (07:39 +0000)]

Merged r14159 (#19558).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14209 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:38:31 +0000 (07:38 +0000)]

Merged r14158 (#19553).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14208 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:37:46 +0000 (07:37 +0000)]

Merged r14165 and r14166 (#19544).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14207 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:35:50 +0000 (07:35 +0000)]

Merged r14162 (#19464).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14206 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:34:25 +0000 (07:34 +0000)]

Merged r14155 (#19405).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:33:28 +0000 (07:33 +0000)]

Merged r14163 (#19168).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14204 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:32:42 +0000 (07:32 +0000)]

Merges r14151 to r14153 (#19163).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14203 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:23:16 +0000 (07:23 +0000)]

Merged r14201 (#13583).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14202 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:20:44 +0000 (07:20 +0000)]

Merged r14164 (#19538).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14199 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Apr 2015 07:18:11 +0000 (07:18 +0000)]

Merged r14156 and r14161 (#19400).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14197 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 24 Apr 2015 07:34:51 +0000 (07:34 +0000)]

3.0-stable: copy Spanish wiki helps to Spanish Panama (#19489)

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14196 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Fri, 24 Apr 2015 07:34:36 +0000 (07:34 +0000)]

Merged r14193 from trunk to 3.0-stable (#19489)

Spanish Panama translation added by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14195 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 19 Apr 2015 10:25:36 +0000 (10:25 +0000)]

Merged r14157 from trunk to 3.0-stable (#19444).

Typo in wiki_syntax_detailed.html.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14183 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 14 Apr 2015 12:53:39 +0000 (12:53 +0000)]

Merged r14175 from trunk to 3.0-stable (#19252)

Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.

r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14176 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 14 Apr 2015 06:54:01 +0000 (06:54 +0000)]

Merged r14172 from trunk to 3.0-stable

.travis.yml: replace DATABASE_ADAPTER to DB

Prevent travis UI confusion.
* https://github.com/travis-ci/travis-ci/issues/3386
* https://github.com/travis-ci/travis-ci/issues/3402

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14173 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 14 Apr 2015 05:35:00 +0000 (05:35 +0000)]

Merged r14167 from trunk to 3.0-stable

Gemfile: pin rmagick version 2.13

rmagick 2.14 prints
'[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14168 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Mar 2015 08:35:46 +0000 (08:35 +0000)]

Merged r14141 and r14146 (#19276).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14150 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 21 Mar 2015 08:30:55 +0000 (08:30 +0000)]

Merged r14140 (#19161).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14149 e93f8b46-1217-0410-a6f0-8f06a7374b81

Mirror of redmine code source: https://github.com/redmine/redmine

RSS Atom