Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-16 10:16:03 +01:00
Code Issues Packages Projects Releases Activity
16,766 Commits 35 Branches 222 Tags
c1b5489a860cbcaa5d031e08f45d16b8be89a953
Commit Graph

64 Commits

Author SHA1 Message Date
Toshi MARUYAMA
14943d8d55 remove spaces inside {} of app/models/enumeration.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@20396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-11-16 12:22:25 +00:00
Go MAEDA
82e0fe13a3 Fix a RuboCop offense Style/SymbolArray due to r20066 (#33289). 
git-svn-id: http://svn.redmine.org/redmine/trunk@20093 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-09-28 08:50:03 +00:00
Go MAEDA
75b3e88cee Fix that updating time tracking activities in a project may take a long time (#33289). 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20066 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-09-22 07:50:46 +00:00
Go MAEDA
907e0173e4 Update copyright year in source files to 2020 (#33069). 
git-svn-id: http://svn.redmine.org/redmine/trunk@19553 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-03-03 00:24:10 +00:00
Go MAEDA
47a71c8011 Reverts r19478 (#32897). 
git-svn-id: http://svn.redmine.org/redmine/trunk@19479 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-01-30 05:27:52 +00:00
Go MAEDA
10bb12e09f Fix 'DEPRECATION WARNING: Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1.' (#32897). 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2020-01-28 09:49:14 +00:00
Toshi MARUYAMA
430236a2af cleanup: rubocop: fix Layout/SpaceAfterComma in app/models/enumeration.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@19270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-24 16:44:50 +00:00
Go MAEDA
4082069c75 Update copyright year. 
git-svn-id: http://svn.redmine.org/redmine/trunk@18198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-05-25 07:36:06 +00:00
Go MAEDA
07b3087fda Enable frozen_string_literal for some files under app and lib directory (#26561). 
git-svn-id: http://svn.redmine.org/redmine/trunk@17977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-16 09:37:35 +00:00
Go MAEDA
5861160ffc Add "frozen_string_literal: false" for all files (#26561). 
This will be changed to true in the future.


git-svn-id: http://svn.redmine.org/redmine/trunk@17947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-03-15 01:32:57 +00:00
Jean-Philippe Lang
d74f0bfd5c Merged rails-5.1 branch (#23630). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-23 11:26:04 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Toshi MARUYAMA
6139e0033a spelling fixes (#25495) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16445 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-02 03:34:44 +00:00
Jean-Philippe Lang
64afa24a7f Replaces acts_as_list with an implementation that handles #position= (#12909). 
Objects are reordered using the regular attribute writer #position= and AR callbacks.

git-svn-id: http://svn.redmine.org/redmine/trunk@15335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-04-17 06:57:20 +00:00
Jean-Philippe Lang
cda9c63d9c Updates copyright for 2016. 
git-svn-id: http://svn.redmine.org/redmine/trunk@15238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-03-13 10:30:10 +00:00
Jean-Philippe Lang
0dcbd13d01 Update enumeration ovverides with their parents (#19657). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-30 21:07:47 +00:00
Jean-Philippe Lang
8eb1e94f4d SQL error with MySQL (#19657). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14633 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-30 20:59:47 +00:00
Jean-Philippe Lang
043264b651 Forces enumeration override position to the same as its parent (#19657). 
git-svn-id: http://svn.redmine.org/redmine/trunk@14627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-09-30 18:35:50 +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
2a6692248b Replaced "can't" with "cannot" in error messages. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13781 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-21 12:39:48 +00:00
Jean-Philippe Lang
36ee95c1f4 Removed ORDER option on acts_as_tree that duplicates default_scope. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13528 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-30 08:01:19 +00:00
Jean-Philippe Lang
3ea84bd7e4 Fixed SQL errors with SQLServer (column specified more than once in the order by list) after r13526. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13527 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-29 22:30:25 +00:00
Jean-Philippe Lang
522bebe5ed Order scopes cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13526 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-29 21:49:33 +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
c777f75edd mark deprecated Enumeration#overridding_change? which was changed in r13056 
git-svn-id: http://svn.redmine.org/redmine/trunk@13086 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-08 12:38:55 +00:00
Toshi MARUYAMA
071d2d7f47 fix typos of source comments at Enumeration model 
git-svn-id: http://svn.redmine.org/redmine/trunk@13072 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-07 08:06:50 +00:00
Toshi MARUYAMA
5e0d93b689 fix typo of Enumeration#overridding_change? 
git-svn-id: http://svn.redmine.org/redmine/trunk@13056 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-06 13:32:35 +00:00
Toshi MARUYAMA
35cc911192 update copyright year (#15977) 
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-29 22:45:39 +00:00
Toshi MARUYAMA
c4a9339e3f Rails4: replace deprecated Relation#update_all at Enumeration model 
git-svn-id: http://svn.redmine.org/redmine/trunk@12510 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-08 04:57:38 +00:00
Jean-Philippe Lang
6c39a260a3 Propose system activities only when reassigning time entries (#13783). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11762 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-05-01 16:43:51 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788). 
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-12 09:29:31 +00:00
Jean-Philippe Lang
8b08c1a534 Prevents position to be specified more than once in the order by list which is not supported by SQLServer (#12713). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11100 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-01-03 11:37:07 +00:00
Jean-Baptiste Barth
4896d5c7e8 Use lambda form in model scopes (#12499) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10949 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-12-07 10:12:47 +00:00
Jean-Philippe Lang
d62b90db73 Makes enumerations available through the REST API. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10664 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-17 17:29:27 +00:00
Jean-Philippe Lang
221585c7b5 Code cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9713 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-25 19:48:22 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 12:56:53 +00:00
Toshi MARUYAMA
d0d01d4e70 model: replace Rails2 "named_scope" to Rails3 "scope" 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9537 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-26 23:51:10 +00:00
Jean-Philippe Lang
528735b955 Use subclasses method instead of class variable. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-24 18:23:58 +00:00
Jean-Philippe Lang
0471de41ff Resourcified enumerations. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8189 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-11 10:26:12 +00:00
Toshi MARUYAMA
92403eb855 Rails3: model: replace deprecated 'before_save' method at Enumeration model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7427 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-09-21 04:50:58 +00:00
Toshi MARUYAMA
8be05afff8 remove trailing white-spaces from app/models/enumeration.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-08-21 01:14:40 +00:00
Jean-Philippe Lang
2072669769 Fixed: Setting issue attributes from mail should be case-insensitive (#8759). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6199 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-07-09 10:50:42 +00:00
Jean-Philippe Lang
8db9ecef08 Removes column opt in enumerations table. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3240 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-25 17:13:58 +00:00
Jean-Philippe Lang
d8c5549168 Changes misleading scopes on Enumeration. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3083 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-21 12:00:49 +00:00
Eric Davis
5833ba9f81 Added a Activities tab to Project Settings 
* Changed Project#activities to allow getting inactive Activities also:
  * Changed the Enumeration#all named_scope to exclude project specific Activities
  * Changed the Project has_many time_entry_activities to include all by default
    and provided an #active method to filter them to active ones only
  * Split Project#activities to two methods and gave it a parameter that is used
    to determine if inactive activities are included (default is no)
* Added a reset button to delete all project specific activities.
* Added ProjectsController#reset_activities to remove the project
  specific activities
* Added a HTTP DELETE route for reset_activities
* Changed the permissions for managing project activities to have access to the
  ProjectsController#reset_activities action
* Added a way to bulk save Project specific Activities in ProjectsController
  * #save_activities will save all the changed activities, including update the
    existing records
  * Added helper methods to the controller which will be refactored later
  * Allow the same TimeEntryActivity names on different projects

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:45 +00:00
Eric Davis
e615266e9a Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities 
* Added Project#activities to return all the Systemwide and Project specific
  activities, excluding Systemwide ones that are overridden.
* Added some tests for TimelogHelper.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2948 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:39 +00:00
Eric Davis
29301c8a38 Added project specific Enumeration overrides. 
These will be used to track if Enumeration's custom data or active state
is overridden on a project.  An overridden Enumeration is one that is associated
with a parent Enumeration.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:34 +00:00
Eric Davis
e76d4c5c4c Added an active field track if an Enumeration is active on the frontend view. 
* Changed TimelogHelper#activity_collection_for_select_options to only use
  active TimeEntryActivities.
* Changed TimelogHelper#activity_collection_for_select_options to return a blank
  option if the time_entry's current activity is inactive.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:28 +00:00
Eric Davis
ac4937a767 Enumerations can now have custom fields defined on them. #4077 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:22 +00:00