Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-05 14:20:22 +01:00
Code Issues Packages Projects Releases Activity
11,571 Commits 35 Branches 225 Tags
33aaa06fe94e4db8f596cf1fb42b56d204b8a353
Commit Graph

11571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Philippe Lang
706e2c87db Merged r14037. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14038 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 19:03:32 +00:00
Jean-Philippe Lang
ec201b08b3 Updates docs fro 3.0.0 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14037 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 19:02:11 +00:00
Jean-Philippe Lang
646a4b3450 Merged r14034 (#19131). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14036 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 19:01:47 +00:00
Jean-Philippe Lang
fd8c95aaf5 Set stable version. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14035 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 17:56:24 +00:00
Jean-Philippe Lang
0b04de0a23 Send a better content type than application/octet-stream (#19131). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14034 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 17:46:24 +00:00
Jean-Philippe Lang
8b0647957d Merged r14032 (#19132). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14033 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 17:38:10 +00:00
Jean-Philippe Lang
d750c9906e DEPRECATION WARNING: db/migrate/001_setup.rb (#19132). 
mail_notification is a boolean column when this migration runs.

git-svn-id: http://svn.redmine.org/redmine/trunk@14032 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-19 17:37:34 +00:00
Jean-Philippe Lang
2277f61046 Added missing :permission option in sample plugin. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14031 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 21:11:37 +00:00
Jean-Philippe Lang
dbcdc3415d Removed no longer used :find_options option for acts_as_activity_provider. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14030 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 21:10:22 +00:00
Jean-Philippe Lang
4323266f6c 3.0-stable branch added. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14029 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 20:28:18 +00:00
Jean-Philippe Lang
8ad326f160 Adds a test for #6579. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14028 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 14:20:47 +00:00
Jean-Philippe Lang
7156f3f28f Set version to 3.0.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14027 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:44:45 +00:00
Jean-Philippe Lang
7e1636fc26 Wrap parent task title on the issue list (#19120). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-18 11:43:31 +00:00
Jean-Philippe Lang
2a7795ab52 Escape flash messages (#19117). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14016 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-17 17:47:36 +00:00
Jean-Philippe Lang
177dd7bff1 Fixed that timestamps may not be formatted as expected in XML responses (#19065). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14015 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-16 17:57:52 +00:00
Jean-Philippe Lang
3ef00ddb58 Check plugins updates using https (#17722). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14014 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-15 16:53:39 +00:00
Toshi MARUYAMA
0872aef85e fix Spanish "mail_body_reminder" spelling (#19111) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14013 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-15 11:17:42 +00:00
Toshi MARUYAMA
dc73155ba2 add redmine.org issue link of jruby IO.popen() at .travis.yml (#19091) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-15 11:17:32 +00:00
Jean-Philippe Lang
76e7025f07 Workaround for timestamps rounding issues with Rails4.2 and mysql5.7 that may kill user session after password is changed (#17460). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14011 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-15 09:09:35 +00:00
Toshi MARUYAMA
77061f59f2 German translation updated by Daniel Felix and Filou Centrinov (#19071) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14010 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-02-15 04:28:03 +00:00