Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-05 06:10:06 +01:00
Code Issues Packages Projects Releases Activity
11,612 Commits 35 Branches 225 Tags
842ee8a5e03a5cc3791efdf89d68a6e4cc3ba4ce
Commit Graph

11612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
842ee8a5e0 Merged r14267 (#19840). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:10:28 +00:00
Jean-Philippe Lang
04df8cbbac Merged r14268 (#19815). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14277 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:06:31 +00:00
Jean-Philippe Lang
f53c19260c Updates for 3.0.3 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14256 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:59:45 +00:00
Jean-Philippe Lang
e0fc848696 Merged r14243 (#19793). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:22:59 +00:00
Jean-Philippe Lang
c6e826502a Merged r14239 and r14240 (#19706). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:22:19 +00:00
Jean-Philippe Lang
68723c20d2 Merged r14245 (#19655). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:21:39 +00:00
Jean-Philippe Lang
b8811f47cc Merged r14237 (#19735). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:20:27 +00:00
Jean-Philippe Lang
010945b3d8 Merged r14241 (#19731). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:19:50 +00:00
Jean-Philippe Lang
20f56ce0ae Merged r14242 (#18580). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:19:06 +00:00
Toshi MARUYAMA
5f1385e096 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
 2015-05-01 16:57:38 +00:00
Toshi MARUYAMA
a971c16a67 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
 2015-04-30 06:20:48 +00:00
Jean-Philippe Lang
436bfd971b Merged r14223. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14224 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-26 06:47:45 +00:00
Jean-Philippe Lang
37c8b09eb5 Merged r14221 (#19570). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14222 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 08:30:53 +00:00
Jean-Philippe Lang
8ff0214d45 Merged r14219 (#19537). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14220 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 08:27:24 +00:00
Jean-Philippe Lang
16516fb48a Merged r14217 (#19185). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14218 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 08:14:04 +00:00
Jean-Philippe Lang
1c8527b8c1 Merged r14215 (#19482). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14216 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 08:01:07 +00:00
Jean-Philippe Lang
5fced3a703 Merged r14180 (#19606). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14214 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:49:13 +00:00
Jean-Philippe Lang
4900525756 Merged r14160 (#19580). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14213 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:46:50 +00:00
Jean-Philippe Lang
1fad29bc14 Merged r14179 (#19569). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14210 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:40:46 +00:00
Jean-Philippe Lang
214e737ee0 Merged r14159 (#19558). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:39:16 +00:00
Jean-Philippe Lang
4af6d9cc5d Merged r14158 (#19553). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14208 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:38:31 +00:00
Jean-Philippe Lang
873dff0d36 Merged r14165 and r14166 (#19544). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:37:46 +00:00
Jean-Philippe Lang
94910b1e09 Merged r14162 (#19464). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14206 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:35:50 +00:00
Jean-Philippe Lang
e2224d4d02 Merged r14155 (#19405). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:34:25 +00:00
Jean-Philippe Lang
d60a78fe23 Merged r14163 (#19168). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14204 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:33:28 +00:00
Jean-Philippe Lang
97939f8829 Merges r14151 to r14153 (#19163). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14203 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:32:42 +00:00
Jean-Philippe Lang
d950d7325f Merged r14201 (#13583). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14202 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:23:16 +00:00
Jean-Philippe Lang
737cbcc2e9 Merged r14164 (#19538). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14199 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:20:44 +00:00
Jean-Philippe Lang
d904292635 Merged r14156 and r14161 (#19400). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14197 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:18:11 +00:00
Toshi MARUYAMA
b12e839672 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
 2015-04-24 07:34:51 +00:00
Toshi MARUYAMA
a05f04d734 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
 2015-04-24 07:34:36 +00:00
Toshi MARUYAMA
d18edfd913 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
 2015-04-19 10:25:36 +00:00
Toshi MARUYAMA
524bd1479b 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
 2015-04-14 12:53:39 +00:00
Toshi MARUYAMA
9c9419eadc 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
 2015-04-14 06:54:01 +00:00
Toshi MARUYAMA
40e599f31b 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
 2015-04-14 05:35:00 +00:00
Jean-Philippe Lang
20eea840f5 Merged r14141 and r14146 (#19276). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14150 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 08:35:46 +00:00
Jean-Philippe Lang
5eb1b2626d Merged r14140 (#19161). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 08:30:55 +00:00
Jean-Philippe Lang
c6c304edf1 Merged r14142 and r14143 (#19400). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14147 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 08:26:22 +00:00
Toshi MARUYAMA
15067de1af Merged r14136 from trunk to 3.0-stable. 
revert r13896 (#14534)

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 10:47:28 +00:00
Toshi MARUYAMA
484ea96b9c Merged r14135 from trunk to 3.0-stable. 
Gemfile: upgrade Rails version to 4.2.1

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14144 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 10:42:43 +00:00
Jean-Philippe Lang
cbc968b545 Merged r14137 (#19297). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14138 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 09:51:37 +00:00
Toshi MARUYAMA
33aaa06fe9 Merged r14132 from trunk to 3.0-stable 
.travis.yml: replace TEST_SUITE to SUITE

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

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14133 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-19 06:01:07 +00:00
Toshi MARUYAMA
92b7b831cb Merged r14076 from trunk to 3.0-stable 
.travis.yml: move "matrix" after "env"

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14131 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-18 14:10:35 +00:00
Toshi MARUYAMA
fee5faa9b8 Merged r14118 from trunk to 3.0-stable 
Gemfile: remove "ffi"

ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252

r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14126 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 23:12:08 +00:00
Jean-Philippe Lang
a74555002f Merged r14121. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14122 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 18:25:16 +00:00
Jean-Philippe Lang
b089d4104a Merged r14112 (#19305). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14113 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 18:13:46 +00:00
Jean-Philippe Lang
2f78c8a7ec Merged r14101 (#19354). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14111 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 14:09:48 +00:00
Jean-Philippe Lang
767064c23a Merged r14108 (#19348). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14109 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 14:06:04 +00:00
Jean-Philippe Lang
348401e165 Merged r14106 (#19313). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14107 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 10:09:43 +00:00
Jean-Philippe Lang
f9a62f2dc3 Merged r14102 (#19381). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14103 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 10:02:48 +00:00