Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-24 13:21:04 +01:00
Code Issues Packages Projects Releases Activity
11,591 Commits 35 Branches 228 Tags
873dff0d364e4e1bfbded5103174737f0479504f
Commit Graph

11591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Toshi MARUYAMA
c271be6d81 Merged r14084, r14086 and r14087 from trunk to 3.0-stable (#19368) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14100 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 16:50:00 +00:00
Toshi MARUYAMA
269b5045ca Merged r14097 from trunk to 3.0-stable 
Gemfile: move "ffi" definition to :test group

Depending:
selenium-webdriver -> childprocess -> ffi

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14098 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 16:32:22 +00:00
Jean-Philippe Lang
8a26ce6a75 Merged r14078. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14096 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:14:01 +00:00
Jean-Philippe Lang
b956621b01 Merged r14083 (#19368). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14095 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:03:58 +00:00
Jean-Philippe Lang
97fc28da3a Merged r14079 (#19316). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14094 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:03:04 +00:00
Jean-Philippe Lang
bcd35e4c44 Merged r14081 (#19323). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14093 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:02:23 +00:00
Jean-Philippe Lang
64d5ba05d8 Merged r14082 (#19322). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14092 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:01:42 +00:00
Jean-Philippe Lang
fa0cdb7515 Merged r14069 (#19325). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14091 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 15:00:45 +00:00
Jean-Philippe Lang
a17effa95b Merged r14071 (#19320). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14090 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 14:59:58 +00:00
Jean-Philippe Lang
fe323eedec Merged r14080 (#19313). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14088 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 14:57:18 +00:00
Toshi MARUYAMA
fae1ce430c Merged r14074 from trunk to 3.0-stable 
run ui test on travis

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14075 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-13 13:35:46 +00:00
Toshi MARUYAMA
394954fb46 Merged r14072 from trunk to 3.0-stable 
unify .travis.run-test.sh to .travis.yml

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14073 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-13 10:25:59 +00:00
Jean-Philippe Lang
795bbbec2f Merged r14065 (#19172). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14066 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 10:37:37 +00:00
Jean-Philippe Lang
7879d8e4dc Merged r14054 (#19225). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14064 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:46:21 +00:00
Jean-Philippe Lang
735c3ae5c5 Merged r14052 (#19233). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14063 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:45:29 +00:00
Jean-Philippe Lang
fc4d0539c0 Merged r14053 (#19253). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14062 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:44:46 +00:00
Jean-Philippe Lang
f4ff617f37 Merged r14047 (#19232). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14061 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:44:08 +00:00
Jean-Philippe Lang
d26f613953 Merged r14051 (#19218). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14060 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:43:29 +00:00
Jean-Philippe Lang
36b70437e0 Merged r14050 (#19260). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14058 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:42:45 +00:00
Jean-Philippe Lang
5cc616b75b Merged r14049 (#19197). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14056 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:41:22 +00:00
Jean-Philippe Lang
86c77bedd4 Merged r14030 and r14031. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14039 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 19:04:45 +00:00