98 Commits

Author SHA1 Message Date
Markus Kahl f5a57e3f42 list custom field normalisation and multi select 2017-02-17 14:38:24 +00:00
Oliver Günther 7cf11bb689 Update copyright notice 2017-01-10 15:11:43 +01:00
Jens Ulferts 32e1036da3 eager load translations 2016-11-22 09:13:14 +01:00
Markus Kahl c722bb72c8 only wp custom fields have types 2016-11-04 16:29:31 +01:00
Markus Kahl 86ab55b323 update type attribute visibility on cf changes
cf = custom field
2016-11-04 15:51:12 +01:00
Oliver Günther fe0e8dd919 Rename before_filter to before_action 2016-09-06 15:40:49 +02:00
Alex Coles e02eb0181d Migrate AR finder/query methods in controllers
Signed-off-by: Alex Coles <alex@alexbcoles.com>
2015-06-30 12:12:51 +02:00
Alex Coles e5da2578d5 Merge branch 'dev' into feature/rails4
Signed-off-by: Alex Coles <alex@alexbcoles.com>

Conflicts:
	.travis.yml
	Gemfile
	Gemfile.lock
	README.md
	app/assets/stylesheets/external.css.sass.erb
	app/assets/stylesheets/legacy/main.css.sass
	app/models/work_package.rb
	config/routes.rb
	lib/tabular_form_builder.rb
	spec/controllers/versions_controller_spec.rb
	spec/exemplars/type_exemplar.rb
	spec/factories/type_factory.rb
	spec/legacy/unit/default_data_spec.rb
	spec/legacy/unit/helpers/application_helper_spec.rb
	spec/legacy/unit/mail_handler_spec.rb
	spec/legacy/unit/project_spec.rb
	spec/legacy/unit/time_entry_activity_spec.rb
	spec/legacy/unit/type_spec.rb
	spec/models/work_package/work_package_validations_spec.rb
	spec/requests/api/v3/render_resource_spec.rb
	test/functional/types_controller_test.rb
	test/test_helper.rb
	test/unit/version_test.rb
2015-05-01 11:39:24 +02:00
Alex Coles e0191e759c Update year in copyright header to 2015
[ci skip]
2015-01-01 00:02:57 +00:00
Alex Coles f35e741387 Merge branch 'dev' into feature/rails4
Signed-off-by: Alex Coles <alex@alexbcoles.com>

Conflicts:
	app/controllers/api/v2/authentication_controller.rb
	app/controllers/api/v2/planning_element_journals_controller.rb
	app/controllers/api/v2/planning_element_type_colors_controller.rb
	app/controllers/api/v2/project_associations_controller.rb
	app/controllers/api/v2/project_types_controller.rb
	app/controllers/api/v2/projects_controller.rb
	app/controllers/api/v2/reported_project_statuses_controller.rb
	app/controllers/api/v2/reportings_controller.rb
	app/controllers/api/v2/timelines_controller.rb
	app/controllers/api/v2/users_controller.rb
	app/controllers/copy_projects_controller.rb
	app/controllers/custom_fields_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/time_entries/reports_controller.rb
	app/controllers/types_controller.rb
	app/controllers/versions_controller.rb
	app/controllers/workflows_controller.rb
	app/helpers/types_helper.rb
	app/models/project.rb
	app/models/query.rb
	app/models/timeline.rb
	app/models/type.rb
	app/models/work_package.rb
	app/models/workflow.rb
	app/services/planning_comparison_service.rb
	config/initializers/10-patches.rb
	config/routes.rb
	db/seeds/production.rb
	features/step_definitions/general_steps.rb
	features/step_definitions/issue_steps.rb
	features/step_definitions/timelines_given_steps.rb
	features/step_definitions/type_steps.rb
	features/step_definitions/work_package_steps.rb
	lib/redmine/default_data/loader.rb
	lib/tasks/ci.rake
	lib/tasks/documentation.rake
	spec/controllers/api/v2/planning_elements_controller_spec.rb
	spec/factories/type_factory.rb
	spec/views/api/v2/custom_fields/index_api_rabl_spec.rb
	spec/views/api/v2/planning_elements/show_api_json_spec.rb
	spec/views/api/v2/projects/show_api_json_spec.rb
2014-11-04 20:50:24 +01:00
Alex Coles bb0e6e6aa5 Fix syntax (w/Rubocop) in (Rails) controllers
Signed-off-by: Alex Coles <alex@alexbcoles.com>
2014-11-03 22:15:11 +01:00
Alex Coles 336446c59d Use 1.9+ Hash syntax in (Rails) controllers
Signed-off-by: Alex Coles <alex@alexbcoles.com>
2014-11-03 22:15:11 +01:00
Alex Coles 0b941955ce Fully qualify ::Type class constant
This fixes a naming collision with AR internals:

    undefined method `find' for ActiveRecord::AttributeMethods::Serialization::Type:Class

Signed-off-by: Alex Coles <alex@alexbcoles.com>
2014-09-13 19:07:45 +02:00
Johannes Wollert 8b096975fe updates copyright headers
updates more copyright

more copyright headers
2014-02-27 16:39:51 +01:00
Philipp Tessenow 6acf1c64bd when having a wrong custom_field_type redirect to general custom_field page 2013-11-19 08:42:34 +01:00
Philipp Tessenow abd35622e3 make custom_fields Rails3ish
- use ressource in routes.rb
- use *_custom_field_path paths
- use strong parameters everywhere
2013-11-19 08:42:34 +01:00
Philipp Tessenow 71043d0d2f whitelist params for custom_fields 2013-11-19 08:42:34 +01:00
Philipp Tessenow 7f272a5a3b make calls to constantize as safe as possible 2013-10-29 16:45:06 +01:00
Philipp Tessenow 444546e2e8 use \A and \z instead of ^ and $ in ruby regexes 2013-10-28 15:07:08 +01:00
Philipp Tessenow a1e67dd460 new copyright header #1903 2013-09-16 17:59:31 +02:00
Martin Czuchra 847a3029a9 Renames Tracker into Type. 2013-07-18 16:18:14 +02:00
Hagen Schink a6f83f1d3c Adapt references to work package 2013-06-25 08:30:05 +02:00
Hagen Schink 82d2400cf0 Let issues work via STI 2013-06-21 15:00:21 +02:00
Jens Ulferts 21459a384f provide every possible file with a short copyright notice
This was done using the rake task: rake copyright:update
2013-06-07 10:49:57 +02:00
Martin Linkhorst 890ceb2524 update request are now :put 2013-01-22 16:53:42 +01:00
Jens Ulferts df082b5ebf setting values of attributes not translated to nil
* doing so enables the fallbacks to work
2012-04-19 18:13:23 +02:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis d2973a641e [#347] Fix potential Execution After Redirect bugs
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.

Contributed by Adam Doupé
2011-04-28 14:39:19 -07:00
Azamat Hackimov eb80b79c26 New strings to localization (#5225)
* error_can_not_delete_custom_field: Unable to delete custom field
* error_unable_to_connect: Unable to connect ({{value}})
* error_can_not_remove_role: This role is in use and can not be deleted.
* error_can_not_delete_tracker: This tracker contains issues and can't be deleted.


git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3627 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-03 11:54:24 +00:00
Jean-Philippe Lang 488c192286 Removes "xxx and return" calls (#4446).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-18 14:22:18 +00:00
Jean-Philippe Lang dfabadf4f7 Adds an admin layout that displays the admin menu in the sidebar.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3176 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-17 18:21:02 +00:00
Eric Davis 451ef7f21f Added several more plugin hooks:
* :controller_custom_fields_new_after_save
* :controller_custom_fields_edit_after_save
* :view_custom_fields_form_upper_box
* :view_custom_fields_form_* (type of custom field)
* :view_issue_statuses_form
* :view_issues_show_description_bottom
* :view_my_account
* :view_users_form

  #2599

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2611 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-21 00:22:59 +00:00
Jean-Philippe Lang 47f5713b1e Reorder links refactoring (follows r2526).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-01 12:03:48 +00:00
Jean-Philippe Lang ee1bb54ab6 CustomFieldsController#list moved to #index.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2274 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-17 08:46:23 +00:00
Jean-Philippe Lang 48295a6c4b CustomFieldsController refactoring.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-17 08:41:30 +00:00
Jean-Philippe Lang 5ed2e78ae2 Make use of tracker_ids association in issue custom field form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-17 08:25:55 +00:00
Jean-Philippe Lang 2fdf4426cd Moves @layout 'base'@ to ApplicationController.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-10 15:22:54 +00:00
Jean-Philippe Lang 898fac293b Adds custom fields on time entries (#772).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-07-22 18:52:00 +00:00
Jean-Philippe Lang 5944696b6d Custom fields can now be reordered.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@901 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-11-12 17:23:14 +00:00
Jean-Philippe Lang e4f2e0fd37 Removed deprecated Object#type in CustomFieldsController.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@615 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-08-12 14:24:04 +00:00
Jean-Philippe Lang 2d5ac54d2e Applied the flash notices patch by Matt Jones (slightly edited).
flash[:notice] and flash[:error] are now used for notice/error messages.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@600 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-08-02 17:42:20 +00:00
Jean-Philippe Lang 027bf93849 added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-03-12 17:59:02 +00:00
Jean-Philippe Lang fa688d48e6 added the ability to set the sort order for trackers
git-svn-id: http://redmine.rubyforge.org/svn/trunk@209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-01-31 21:18:43 +00:00
Jean-Philippe Lang f9c400a727 custom fields list screen split in 3 tabs (one for each kind of custom fields)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2007-01-31 20:10:21 +00:00
Jean-Philippe Lang 96f83cc8f0 trunk moved from /trunk/redmine to /trunk
git-svn-id: http://redmine.rubyforge.org/svn/trunk@67 e93f8b46-1217-0410-a6f0-8f06a7374b81
2006-12-05 20:45:04 +00:00