meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity
11,772 Commits 32 Branches 194 Tags
Commit Graph

11772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
958d93edbc add markdown wiki syntax help to tool bar (#16373) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14191 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 12:14:04 +00:00
Toshi MARUYAMA
47a6a54e87 copy English markdown wiki syntax help to other languages (#16373) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14190 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 12:00:17 +00:00
Toshi MARUYAMA
a5b40dc4a7 add English markdown wiki syntax help (#16373) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14189 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 11:54:58 +00:00
Toshi MARUYAMA
ef8328ab3b remove trailing white spaces from public/javascripts/jstoolbar/markdown.js 
git-svn-id: http://svn.redmine.org/redmine/trunk@14188 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 10:50:46 +00:00
Toshi MARUYAMA
06ea3e48eb rename textile wiki syntax help files (#16373) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14187 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 07:52:57 +00:00
Toshi MARUYAMA
b0e9033eee change Japanese translation for field_login (#19509) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14186 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-20 03:55:00 +00:00
Toshi MARUYAMA
9ad21e9726 replace tabs to spaces at test/fixtures/ldap/slapd.conf 
git-svn-id: http://svn.redmine.org/redmine/trunk@14185 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-19 10:33:23 +00:00
Toshi MARUYAMA
5a71c37f35 remove trailing white space from Gemfile 
git-svn-id: http://svn.redmine.org/redmine/trunk@14182 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-18 15:22:23 +00:00
Jean-Philippe Lang
9415eff064 When changing tracker, clear the attributes that are disabled for the new tracker (#17527). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14180 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 17:16:52 +00:00
Jean-Philippe Lang
a9f052532e Fixed workflow rules when user has duplicated role by inheritance (#19569). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14179 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 17:01:23 +00:00
Jean-Philippe Lang
0a32e898f1 Generate tag once per request. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14178 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 16:59:04 +00:00
Toshi MARUYAMA
b4a8adc147 Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8 (#19252) 
r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.

git-svn-id: http://svn.redmine.org/redmine/trunk@14175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 12:49:37 +00:00
Toshi MARUYAMA
1dc76f210b .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/trunk@14172 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 06:27:12 +00:00
Toshi MARUYAMA
cf6b7148f1 remove trailing white spaces from test/unit/helpers/application_helper_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@14171 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 05:38:26 +00:00
Toshi MARUYAMA
40c4682b5b upgrade rmagick to 2.14 
And replace deprecated requiring "RMagick" to "rmagick".

git-svn-id: http://svn.redmine.org/redmine/trunk@14170 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 05:38:14 +00:00
Toshi MARUYAMA
d3ca9f36fe 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/trunk@14167 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-14 04:50:43 +00:00
Jean-Philippe Lang
94a9e2848f Fixed test failures (#19544). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14166 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 12:34:38 +00:00
Jean-Philippe Lang
9cb9f67055 SQL error with SQLServer when grouping+sorting issues (#19544). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14165 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 09:44:32 +00:00
Jean-Philippe Lang
78153cacdf Keywords in commit messages: journal entries are created even if nothing was changed (#19538). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 09:16:54 +00:00
Jean-Philippe Lang
cb9d405db3 Fixed that journals are shown multiple times in activity (#19168). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14163 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 07:55:30 +00:00
Jean-Philippe Lang
3d1c40cd52 Fixed validation when logging time on issue (#19464). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14162 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 07:37:18 +00:00
Jean-Philippe Lang
8c6e5513a1 Fixed tests failures (#19400). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14161 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-12 06:53:04 +00:00
Jean-Philippe Lang
b474ad67de "Required" and "Read-only" rules on "Fields Permissions" screen are not colored (#19580). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14160 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-11 07:54:20 +00:00
Jean-Philippe Lang
09eef4e75c Mail handler should not ignore emails with x-auto-response-suppress header (#19558). 
Patch by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/trunk@14159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-11 07:15:38 +00:00
Jean-Philippe Lang
11e8dc263f When create by copying the issue, status can not be changed to default (#19553). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14158 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-11 07:09:11 +00:00
Jean-Philippe Lang
b88cac254e Typo in wiki_syntax_detailed.html (#19444). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14157 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-11 06:29:21 +00:00
Jean-Philippe Lang
5cd29b1a6b Fixed that 2 repositories can be created with blank/nil identifier (#19400). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14156 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-11 06:27:54 +00:00
Jean-Philippe Lang
a769aedb44 Fixed that setting config.logger.level in additional_environment.rb has no effect (#19405). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14155 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-22 09:26:33 +00:00
Jean-Philippe Lang
ca2be43456 Include custom fields description in project settings and issue view (#19296). 
Patch by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/trunk@14154 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 10:24:18 +00:00
Jean-Philippe Lang
ab4916b01a Fixed test failures (#19163). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14153 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 10:05:11 +00:00
Jean-Philippe Lang
f5668d0650 Fixed that the bulk edit form shows additional custom fields (#19163). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14152 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 09:27:09 +00:00
Jean-Philippe Lang
1448f1731f Fixed that the bulk edit form shows additional custom fields (#19163). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14151 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 09:26:18 +00:00
Jean-Philippe Lang
ea099fb771 Don't render the issue form if issue.project is nil (#19276). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 16:27:09 +00:00
Jean-Philippe Lang
98c28b467b Don't validate the repository when updating/clearing extra info (#19400). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 10:23:12 +00:00
Jean-Philippe Lang
e9caae140d Don't allow 2 repositories with blank identifier (#19400). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 10:20:57 +00:00
Jean-Philippe Lang
d509341797 API: creating an issue with an invalid project_id should return 422 instead of 403 (#19276). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14141 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 10:02:45 +00:00
Jean-Philippe Lang
c0c05ec41e Don't let users be sorted by email (#19161). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 09:58:32 +00:00
Jean-Philippe Lang
84c8ca6fef Fixed that custom fields with hidden/read-only combination may be displayed on issue form (#19297). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14137 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 09:17:54 +00:00
Toshi MARUYAMA
86c6afb545 revert r13896 (#14534) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 07:26:34 +00:00
Toshi MARUYAMA
c8fb677a1f Gemfile: upgrade Rails version to 4.2.1 
git-svn-id: http://svn.redmine.org/redmine/trunk@14135 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 06:16:56 +00:00
Toshi MARUYAMA
aad54b46bc .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/trunk@14132 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-19 05:52:20 +00:00
Toshi MARUYAMA
0b3e715541 add MariaDB 5.5 environment to travis (#17460, #19344, #19395) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 23:20:58 +00:00
Jean-Philippe Lang
5bf40a35cb Updates for 3.0.1 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14121 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 18:24:37 +00:00
Toshi MARUYAMA
1375b5b8c2 remove trailing white-space from app/models/issue.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@14120 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 05:10:47 +00:00
Toshi MARUYAMA
8d121cbec1 Gemfile: remove "ffi" 
ffi 1.9.6 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252

git-svn-id: http://svn.redmine.org/redmine/trunk@14118 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 04:42:29 +00:00
Jean-Philippe Lang
12263ae626 Reverts r14115 in trunk. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 20:27:12 +00:00
Jean-Philippe Lang
3f46dfdee9 Compatibility with ruby1.8 (#19305). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14115 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 19:56:54 +00:00
Jean-Philippe Lang
ed2a3a2244 Make sure that settings are unserialized as UTF-8 encoded strings (#19305). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 14:38:46 +00:00
Jean-Philippe Lang
5c43b4860e Restored project name as version prefix when different (#19348). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14108 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 14:05:29 +00:00
Jean-Philippe Lang
e920e951e7 Don't run test if Redcarpet is not available (#19313). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14106 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 10:09:17 +00:00