meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-21 16:01:14 +00:00
Code Issues Releases Wiki Activity
12,956 Commits 32 Branches 194 Tags
Commit Graph

12956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
e21f60a15e Portuguese translation for 3.0-stable updated by Rui Rebelo (#20728, #20746) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14587 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 13:38:45 +00:00
Toshi MARUYAMA
b6af9da631 Portuguese translation for 2.6-stable updated by Rui Rebelo (#20728, #20745) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14586 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 13:38:34 +00:00
Toshi MARUYAMA
454ef923af Spanish and Spanish Panama translation updated by Leonel Iturralde (#20708) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14585 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 11:33:35 +00:00
Toshi MARUYAMA
9c16aca321 Japanese "spent time" translation changed by Go MAEDA (#20731) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14584 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 10:27:52 +00:00
Toshi MARUYAMA
1b9bc680bf Japanese translation updated by Go MAEDA (#20729) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14582 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 10:08:10 +00:00
Toshi MARUYAMA
93ce9811be trunk: Merged r14580 from 2.6-stable. 
travis: upgrade jruby-9.0.0.0 to jruby-9.0.1.0.

git-svn-id: http://svn.redmine.org/redmine/trunk@14581 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 08:01:04 +00:00
Toshi MARUYAMA
08e666393d trunk: merge r14572 from 3.1-stable (#20452) 
fix Czech textile ol example.

git-svn-id: http://svn.redmine.org/redmine/trunk@14573 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 06:13:31 +00:00
Toshi MARUYAMA
1e156ad70d Traditional Chinese "issue" translation changed by ChunChang Lo (#20720) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14569 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 04:40:15 +00:00
Toshi MARUYAMA
48ba61e849 Traditional Chinese translation updated by ChunChang Lo (#20720) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14568 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-14 04:40:02 +00:00
Jean-Philippe Lang
434eec7eb7 Adds a test for #20714. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14561 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:37:48 +00:00
Jean-Philippe Lang
032f2c9be6 Open redirect vulnerability (#19577). 
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@14560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-13 14:35:20 +00:00
Jean-Philippe Lang
6583c1774d Adds translation strings (#20688). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14555 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:47:48 +00:00
Jean-Philippe Lang
59e4b268af Adds a Total estimated hours column on issue list (#20688). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14554 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:47:21 +00:00
Jean-Philippe Lang
de9b8e7ef4 Help cursor showing up on span tags with title (#20633). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14552 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 12:30:43 +00:00
Jean-Philippe Lang
141c83bdc7 WARNING: Can't mass-assign protected attributes for User (#20490). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14550 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-12 11:11:40 +00:00
Toshi MARUYAMA
f1ed7dc523 Gemfile: remove loofah definition (#16962, #19419) 
actionpack 4.2 depends on loofah.

git-svn-id: http://svn.redmine.org/redmine/trunk@14542 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-01 00:15:24 +00:00
Toshi MARUYAMA
d90de96def trunk: revert r14300 (#16535, #20466, #20641) 
Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14541 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-01 00:15:13 +00:00
Toshi MARUYAMA
0dc3c2fe1c add roadie-rails gem for e-mail inline styles (#8335, #20641) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14540 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-31 07:38:29 +00:00
Toshi MARUYAMA
3b45b2e55c travis: add PostgreSQL environments 
git-svn-id: http://svn.redmine.org/redmine/trunk@14530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 04:53:56 +00:00
Toshi MARUYAMA
4f6f2a7e27 travis: allow failures on jruby 9000 
git-svn-id: http://svn.redmine.org/redmine/trunk@14529 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 04:53:43 +00:00
Toshi MARUYAMA
6501dd7163 trunk: merge r14527 from 2.6-stable 
travis: add jruby 9000

refer:
https://github.com/travis-ci/travis-ci/issues/4720

git-svn-id: http://svn.redmine.org/redmine/trunk@14528 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-30 00:37:16 +00:00
Toshi MARUYAMA
70c61810e4 travis: allow test failures on MySQL 5.7 
<pre>
ActiveRecord::StatementInvalid: Mysql2::Error:
  Table 'performance_schema.session_variables' doesn't exist:
  SHOW VARIABLES LIKE 'character_set_database'
</pre>

Refer:

* https://github.com/rails/rails/issues/21108
* https://github.com/rails/rails/pull/21318

git-svn-id: http://svn.redmine.org/redmine/trunk@14525 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 23:13:32 +00:00
Toshi MARUYAMA
677ed9d980 travis: allow ui test failure on all environments (#20251) 
Refer:
https://github.com/travis-ci/travis-ci/issues/3225

git-svn-id: http://svn.redmine.org/redmine/trunk@14522 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 07:12:47 +00:00
Toshi MARUYAMA
be2332c1ee Gemfile: update Rails to 4.2.4 
git-svn-id: http://svn.redmine.org/redmine/trunk@14521 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-29 07:03:17 +00:00
Jean-Philippe Lang
a19f6fb500 Reverts r14510 (#20508) and r14511 (#20507), tests broken. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-22 11:49:12 +00:00
Toshi MARUYAMA
1a630c5581 trunk: merge r14516 from 3.1-stable (#20452) 
Czech wiki help translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/trunk@14519 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 15:16:19 +00:00
Toshi MARUYAMA
ebed0b9ed2 Czech translation updated by Karel Pičman (#20452) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14517 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 14:59:37 +00:00
Toshi MARUYAMA
25bf5de15d Czech translation for 2.6-stable updated by Karel Pičman (#20452, #20557) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 13:39:30 +00:00
Jean-Philippe Lang
b4c091d063 Don't render empty divs when there are no custom fields on the issue form (#20501). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14512 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 07:05:25 +00:00
Jean-Philippe Lang
d00c5f06d9 ThemesHelper reopening ApplicationHelper is problem with autoloading (#20507). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14511 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 06:59:24 +00:00
Jean-Philippe Lang
5626ee94ed Required file lib/redmine/hook.rb is patching autoloaded ApplicationHelper (#20508). 
Patch by Ondřej.

git-svn-id: http://svn.redmine.org/redmine/trunk@14510 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 06:57:50 +00:00
Jean-Philippe Lang
2b43b7e838 Redmine I18n autoload instead of require (#20506). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14509 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 06:54:26 +00:00
Jean-Philippe Lang
b5af1cb235 Project.copy_from deletes enabled_modules on source (#20512). 
Fix by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14508 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 06:46:49 +00:00
Toshi MARUYAMA
a6c0e0e886 Japanese translation updated by Go MAEDA (#20538) 
git-svn-id: http://svn.redmine.org/redmine/trunk@14507 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-18 00:43:57 +00:00
Jean-Philippe Lang
139808b58d Find user by login then by email. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14506 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 09:28:34 +00:00
Jean-Philippe Lang
178a5e8e54 DEPRECATION WARNING: #timestamps was called without specifying an option for null (#905, #20533). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14505 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 09:22:37 +00:00
Jean-Philippe Lang
5fffbdc016 CSV importer raises I18n::InvalidLocale exception if current user's language is "(auto)" (#905, #20535). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14504 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 09:19:12 +00:00
Jean-Philippe Lang
f820ccce3b Use same logic for finding user as a custom field (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14503 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 09:15:13 +00:00
Jean-Philippe Lang
9c8c1cdb54 #downcase no longer needed after r14484 (#20369). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14502 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 07:07:32 +00:00
Jean-Philippe Lang
212f7ffe58 Use same logic for finding user when importing a file (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 07:06:43 +00:00
Jean-Philippe Lang
eac2974e71 Moved implementation to Principal. 
git-svn-id: http://svn.redmine.org/redmine/trunk@14500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 06:57:55 +00:00
Jean-Philippe Lang
b66358ac6c Fixed that #find_assignee_from_keyword may return a group with blank keyword (#20454). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14499 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 06:47:18 +00:00
Jean-Philippe Lang
4e8f1f92b3 #downcase no longer needed after r14484 (#20369). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14498 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 06:44:14 +00:00
Jean-Philippe Lang
519ad3b03d Use named scope to find the matching version (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14497 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-15 06:22:21 +00:00
Jean-Philippe Lang
67ea285dea Set default date format based on user locale (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14496 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 15:52:04 +00:00
Jean-Philippe Lang
722eaed721 Adds support for custom date format when importing a CSV file (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14495 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 15:42:28 +00:00
Jean-Philippe Lang
fe24da53e7 Adds translation strings (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14494 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 09:00:51 +00:00
Jean-Philippe Lang
035edd39c4 Import issues from CSV file (#950). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14493 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 08:20:32 +00:00
Toshi MARUYAMA
763d5dddde [#20288] Update the CodeRay Ruby syntax highlight example. 
This commit changes the following:

* Remove line numbering from syntax highlight example.
* Add span with 'CodeRay' class around the syntax highlight example.
* Fix span classes in the syntax highlight example:
** Ruby scanner changed from ':reserved' to ':keyword' with CodeRay 1.0.0.
* Remove obsolete line numbering styles.
* Fix internal stylesheet to match CodeRay 1.1.0 (preserving r10132's changes).
* Sort internal styles and remove superfluous newlines between styles.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14492 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 02:47:54 +00:00
Toshi MARUYAMA
0554143d7e [#20288] Make clear that syntax highlighting cannot only be used in wiki pages. 
Regarding the i18n: I used English as the base language. The
changed sentence was the same in 93 out of 98 language files,
public\help\xx[-xx]\wiki_syntax_detailed_[markdown||textile].html.

The only five exceptions were:

* cs; public\help\cs\wiki_syntax_detailed_textile.html
* fr; public\help\fr\wiki_syntax_detailed_textile.html
* ja; public\help\ja\wiki_syntax_detailed_textile.html
* ru; public\help\ru\qiki_syntax_detailed_textile.html
* zh-tw; public\help\zh-tw\wiki_syntax_detailed_textile.html

In the above given files, the changed sentence is translated. I
have replaced the whole translated sentence with the new English
base sentence, as such leaving new translations up to translators.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14491 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-08-14 02:38:25 +00:00