1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00

11061 Commits

Author SHA1 Message Date
Toshi MARUYAMA
be48d44fe7 reflect r13487 and r13488 svn:ignore changes to .hgignore and .gitignore (#8817)
git-svn-id: http://svn.redmine.org/redmine/trunk@13492 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 23:56:12 +00:00
Jean-Philippe Lang
94a491e0ca Replaced Board#topics with a regular method.
git-svn-id: http://svn.redmine.org/redmine/trunk@13491 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 19:40:55 +00:00
Jean-Philippe Lang
116eb8bcc7 Fixed an SQL error with SQLServer (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13490 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 19:34:00 +00:00
Jean-Philippe Lang
9b7d176e49 Adds path to plugin_assets directory in admin/info (#8817).
git-svn-id: http://svn.redmine.org/redmine/trunk@13489 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 19:10:12 +00:00
Jean-Philippe Lang
ec3b7b182e Set svn:ignore to * for plugin_assets subdirectories (#8817).
git-svn-id: http://svn.redmine.org/redmine/trunk@13488 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:56:51 +00:00
Jean-Philippe Lang
defe50dd3d Removed svn:ignore for public/plugin_assets directory (#8817).
git-svn-id: http://svn.redmine.org/redmine/trunk@13487 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:55:23 +00:00
Jean-Philippe Lang
fea9a8ce48 Add public/plugin_assets directory (#8817).
git-svn-id: http://svn.redmine.org/redmine/trunk@13486 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:54:32 +00:00
Jean-Philippe Lang
360895068e Code cleanup, use array instead of handcrafted update.
git-svn-id: http://svn.redmine.org/redmine/trunk@13485 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:51:00 +00:00
Jean-Philippe Lang
498a34403a Removed unneeded :foreign_key option on belongs_to associations.
git-svn-id: http://svn.redmine.org/redmine/trunk@13484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:41:03 +00:00
Jean-Philippe Lang
0fc1906201 Removed deprecated stuff for Redmine 3.0.
git-svn-id: http://svn.redmine.org/redmine/trunk@13483 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 18:28:33 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 17:37:16 +00:00
Toshi MARUYAMA
a6ec78a4dc German translation updated by Gundolf Dampf (#18157)
git-svn-id: http://svn.redmine.org/redmine/trunk@13479 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 08:24:22 +00:00
Toshi MARUYAMA
3e70e5c563 Spanish translation updated by Jesus Gutierrez de la Vega (#18156)
git-svn-id: http://svn.redmine.org/redmine/trunk@13478 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 07:47:13 +00:00
Jean-Philippe Lang
146af67b3c Adds a Cancel button on issue edit view (#18051).
Patch by Marcin Świątkiewicz.

git-svn-id: http://svn.redmine.org/redmine/trunk@13477 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-21 20:53:07 +00:00
Jean-Philippe Lang
71351ce232 Updates for 2.6.0 release.
git-svn-id: http://svn.redmine.org/redmine/trunk@13471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-21 18:58:59 +00:00
Jean-Philippe Lang
b01c740980 Fixed test failure with MySQL introduced by r13467.
git-svn-id: http://svn.redmine.org/redmine/trunk@13468 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-21 18:44:33 +00:00
Jean-Philippe Lang
51508f67d0 Fixed test failure with SQLServer introduced by r13461.
git-svn-id: http://svn.redmine.org/redmine/trunk@13467 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-21 17:47:18 +00:00
Jean-Philippe Lang
78120536b1 Fixed tests broken by r13461.
git-svn-id: http://svn.redmine.org/redmine/trunk@13466 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-20 21:47:43 +00:00
Jean-Philippe Lang
526623980d Fixed: German translation on "delete my account" page showing a "\n" (#18144).
git-svn-id: http://svn.redmine.org/redmine/trunk@13464 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-20 21:22:42 +00:00
Jean-Philippe Lang
cac6ebb6c5 Code cleanup, removed raw SQL queries.
git-svn-id: http://svn.redmine.org/redmine/trunk@13461 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-20 19:16:09 +00:00
Toshi MARUYAMA
e23d4d9b4e pdf: define "general_pdf_fontname" at i18n yaml for multilingual environment (#13781)
Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/trunk@13458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-20 04:15:11 +00:00
Toshi MARUYAMA
92f2ab6b70 use deep_dup to prevent losing mail receiving options (#14491)
git-svn-id: http://svn.redmine.org/redmine/trunk@13457 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-20 04:04:38 +00:00
Jean-Philippe Lang
c4484a40c0 Use relative URL for thumbnails according to :only_path option (#18119).
git-svn-id: http://svn.redmine.org/redmine/trunk@13451 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-18 10:14:17 +00:00
Jean-Philippe Lang
6bdef3ca64 Ignore locales without :general_lang_name key (#18110).
git-svn-id: http://svn.redmine.org/redmine/trunk@13450 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-18 09:07:51 +00:00
Jean-Philippe Lang
ff9be52e45 Ability to render multiple partials with view hook (#17763).
git-svn-id: http://svn.redmine.org/redmine/trunk@13449 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-18 08:09:31 +00:00
Toshi MARUYAMA
2ab1a9dccd Japanese translation updated by Go MAEDA (#18069)
git-svn-id: http://svn.redmine.org/redmine/trunk@13439 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-12 13:50:50 +00:00
Jean-Philippe Lang
6d10e8cd13 Set version to 2.6.0.
git-svn-id: http://svn.redmine.org/redmine/trunk@13436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-12 13:02:03 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047)
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-08 14:59:21 +00:00
Toshi MARUYAMA
bfe7997e38 remove unneeded instance variable assignment from ProjectNestedSetTest
git-svn-id: http://svn.redmine.org/redmine/trunk@13430 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-08 14:20:34 +00:00
Jean-Philippe Lang
85f2074aff Reverts change in r13428, project can't be found by identifier (#17959).
git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-05 13:24:24 +00:00
Jean-Philippe Lang
74cd72a2d9 Fixed that preview doesn't show notes when issue project is changed (#17959).
git-svn-id: http://svn.redmine.org/redmine/trunk@13428 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-05 13:18:55 +00:00
Jean-Philippe Lang
a567546335 Don't link multiple changesets from the same commit multiple times (#17931).
git-svn-id: http://svn.redmine.org/redmine/trunk@13427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-05 12:10:33 +00:00
Jean-Philippe Lang
8b678837a3 Adds a test for adding a group membership with the REST API (#17904).
git-svn-id: http://svn.redmine.org/redmine/trunk@13426 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-04 09:46:50 +00:00
Jean-Philippe Lang
8b998ec05b Adds css classes to get sort order on the issue list (#17993).
git-svn-id: http://svn.redmine.org/redmine/trunk@13425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-04 09:36:35 +00:00
Jean-Philippe Lang
2e9b28906d Removes routes for time entries nested under project/issues.
git-svn-id: http://svn.redmine.org/redmine/trunk@13424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-04 09:14:17 +00:00
Jean-Philippe Lang
efdf2584b6 Adds a link to /time_entries/new from My Page Spent Time block (#17955).
git-svn-id: http://svn.redmine.org/redmine/trunk@13423 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-04 07:26:48 +00:00
Jean-Philippe Lang
15d5c331eb Let the new time_entry form be submitted without project (#17954).
git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-04 07:23:14 +00:00
Toshi MARUYAMA
1232f0670e Traditional Chinese translation updated by ChunChang Lo (#18002)
git-svn-id: http://svn.redmine.org/redmine/trunk@13421 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-01 07:22:38 +00:00
Jean-Philippe Lang
86a33395db Fixed test failure with ruby1.8.7 and postgresql (#17976).
git-svn-id: http://svn.redmine.org/redmine/trunk@13420 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-30 20:41:15 +00:00
Toshi MARUYAMA
105cc74b00 Bulgarian translation updated by Ivan Cenov (#17992)
git-svn-id: http://svn.redmine.org/redmine/trunk@13419 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-29 11:15:29 +00:00
Jean-Philippe Lang
d2837bc187 Adds locales strings (#17976).
git-svn-id: http://svn.redmine.org/redmine/trunk@13418 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-28 14:51:42 +00:00
Jean-Philippe Lang
7e7ac5340a Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976).
git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-28 14:51:08 +00:00
Toshi MARUYAMA
9a7fb0ad7b import jQuery Datepicker i18n files version 1.11.1
874945e66d

git-svn-id: http://svn.redmine.org/redmine/trunk@13416 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-27 05:22:10 +00:00
Toshi MARUYAMA
5ce32798f2 rename jQuery Datepicker i18n file name
jquery-ui renamed these files.
21154cfa2e

git-svn-id: http://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-27 05:14:53 +00:00
Jean-Philippe Lang
8ae41b4846 Ignore email keywords after truncation line (#8758).
git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-20 07:51:37 +00:00
Jean-Baptiste Barth
b519aba63e Expire other sessions on password change (#17796).
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-16 21:38:54 +00:00
Jean-Baptiste Barth
e632a79d59 Add a constraint on "shoulda-matchers" version (#17828).
This helps bundler find its dependencies in case shoulda-matchers v1.4.2 is
already installed. In such a case bundler breaks while it shouldn't.


git-svn-id: http://svn.redmine.org/redmine/trunk@13411 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-16 21:17:29 +00:00
Toshi MARUYAMA
5a96012ad0 remove trailing white-space from app/models/issue_custom_field.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-16 02:54:12 +00:00
Toshi MARUYAMA
a614678835 Gemfile: update rbpdf version to 1.18.1 (#17570)
git-svn-id: http://svn.redmine.org/redmine/trunk@13409 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-16 02:18:48 +00:00
Toshi MARUYAMA
cc688bb1b1 Backport r13313 from rails-4.1 to trunk.
Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-09-14 14:17:52 +00:00