2046 Commits

Author SHA1 Message Date
Jean-Philippe Lang
8ff0214d45 Merged r14219 (#19537).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14220 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 08:27:24 +00:00
Jean-Philippe Lang
5fced3a703 Merged r14180 (#19606).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14214 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:49:13 +00:00
Jean-Philippe Lang
1fad29bc14 Merged r14179 (#19569).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:40:46 +00:00
Jean-Philippe Lang
214e737ee0 Merged r14159 (#19558).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:39:16 +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
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
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
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
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
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
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
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
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
Jean-Philippe Lang
ae4eb47881 Adds custom fields to documents (#7249).
git-svn-id: http://svn.redmine.org/redmine/trunk@14004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-14 10:44:59 +00:00
Jean-Philippe Lang
3da7b1bc28 Implements /issues/new form for creating issues outside a project (#1003).
git-svn-id: http://svn.redmine.org/redmine/trunk@13999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-14 08:03:51 +00:00
Jean-Philippe Lang
37aa016740 Added Issue#attributes_editable?
git-svn-id: http://svn.redmine.org/redmine/trunk@13996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-13 19:30:15 +00:00
Jean-Philippe Lang
2b124f1e61 Don't call #upcase on nil.
git-svn-id: http://svn.redmine.org/redmine/trunk@13994 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-08 16:24:19 +00:00
Jean-Philippe Lang
db9bf8cd73 Fixed filtering on date custom field with SQLServer.
git-svn-id: http://svn.redmine.org/redmine/trunk@13993 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-08 16:23:16 +00:00
Jean-Philippe Lang
6aaaac2373 Fixed an error in IssuesControllerTest#test_index_with_query_grouped_by_tracker_in_reverse_order with SQLServer.
git-svn-id: http://svn.redmine.org/redmine/trunk@13991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-08 15:35:12 +00:00
Jean-Philippe Lang
c3c7d9a4d2 Adds a :copy_issues permission (#18855).
When copy is allowed, target projects are those on which the user has the :add_issues permission.

git-svn-id: http://svn.redmine.org/redmine/trunk@13985 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-08 12:07:00 +00:00
Jean-Philippe Lang
01f673be08 Removed :move_issues permission (#18855).
This permission was wrongly used to allow bulk issue copy. To prevent user from moving an issue to another project, the project field should now be set to read-only in the workflow permissions. A migration does this automatically for roles that have the edit_issues permission without having the move_issues permission.

git-svn-id: http://svn.redmine.org/redmine/trunk@13981 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-08 10:20:53 +00:00
Jean-Philippe Lang
4bbd3d81fd TimeEntry acts_as_activity_provider scope should joins(:project) (#18818).
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13971 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-07 09:10:57 +00:00
Jean-Philippe Lang
3bd2b43a2f Raise an error if version is not found (#18983).
git-svn-id: http://svn.redmine.org/redmine/trunk@13965 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-07 08:12:06 +00:00
Jean-Philippe Lang
e94920a5ff Allow filtering of Redmine Reminders by Version (#18983).
Patch by Merul Patel.

git-svn-id: http://svn.redmine.org/redmine/trunk@13964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-07 07:56:58 +00:00
Jean-Philippe Lang
726a9aa809 Set :inverse_of on details association.
git-svn-id: http://svn.redmine.org/redmine/trunk@13936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-24 10:23:53 +00:00
Jean-Philippe Lang
9d3f3289b8 Memorize project override roles.
git-svn-id: http://svn.redmine.org/redmine/trunk@13934 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-24 08:54:04 +00:00
Jean-Philippe Lang
6f661d40b3 Set :inverse_of option on journals association.
git-svn-id: http://svn.redmine.org/redmine/trunk@13923 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-21 08:27:46 +00:00
Toshi MARUYAMA
8327f650c3 fix code indent at app/models/repository/cvs.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@13905 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-18 16:40:42 +00:00
Toshi MARUYAMA
ad9fd2b66b use "where" instead of find_by_ at Repository::Cvs class
git-svn-id: http://svn.redmine.org/redmine/trunk@13904 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-18 16:40:34 +00:00
Toshi MARUYAMA
2cc3ba063f revert r13901
git-svn-id: http://svn.redmine.org/redmine/trunk@13903 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-18 16:27:31 +00:00
Toshi MARUYAMA
6cc1f2be54 workaround unit cvs test failure on sqlite3
git-svn-id: http://svn.redmine.org/redmine/trunk@13901 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-18 16:13:05 +00:00
Jean-Philippe Lang
0bcd5be0a5 Use attribute writers instead of before_create callback to normalize comments and committer (#14534).
Unlike other adapters, SQLite raises Encoding::UndefinedConversionError before the callback that reencodes attributes is called.

git-svn-id: http://svn.redmine.org/redmine/trunk@13896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-18 11:43:58 +00:00
Jean-Philippe Lang
d85f73a30d Upgrade to Rails 4.2.0 (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-17 17:02:55 +00:00
Jean-Philippe Lang
a3a8fee8ad Send password reset email to the email used in lost password form (#4244).
git-svn-id: http://svn.redmine.org/redmine/trunk@13888 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-17 14:51:29 +00:00
Jean-Philippe Lang
e3618bdbec Add support for multiple email addresses per user (#4244).
git-svn-id: http://svn.redmine.org/redmine/trunk@13886 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-17 14:14:12 +00:00
Jean-Philippe Lang
000124f44f Copyright update.
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-11 09:09:50 +00:00
Jean-Philippe Lang
0ed895388b Option to search open issues only (#10734).
git-svn-id: http://svn.redmine.org/redmine/trunk@13858 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-10 10:09:34 +00:00
Jean-Philippe Lang
576a13e99d Option to search attachment filenames and description (#4383).
git-svn-id: http://svn.redmine.org/redmine/trunk@13856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-09 21:06:09 +00:00
Jean-Philippe Lang
742895183a Search custom fields and journals with different queries to take advantage of indexes on text columns if present.
git-svn-id: http://svn.redmine.org/redmine/trunk@13855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-08 22:04:00 +00:00
Jean-Philippe Lang
0eda7765fa Skip validation if attribute did not change.
git-svn-id: http://svn.redmine.org/redmine/trunk@13851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-07 22:51:45 +00:00
Jean-Philippe Lang
8db1cdd6f1 Deprecates Project#set_allowed_parent!.
git-svn-id: http://svn.redmine.org/redmine/trunk@13849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-07 22:33:25 +00:00
Jean-Philippe Lang
fd4a911304 Fixed that project copy triggers a 500 error if project validation fails.
git-svn-id: http://svn.redmine.org/redmine/trunk@13848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-07 22:29:50 +00:00
Jean-Philippe Lang
5d2eea1489 Cleans up parent project assignment in ProjectsController.
git-svn-id: http://svn.redmine.org/redmine/trunk@13847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-07 22:19:57 +00:00
Jean-Philippe Lang
ded15dfc80 Moved Project#hierarchy to NestedSet::Traversing.
git-svn-id: http://svn.redmine.org/redmine/trunk@13843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-07 20:37:06 +00:00