OpenProject is the leading open source project management software.

kanbanworkflowstimelinescrumrubyroadmapproject-planningproject-managementopenprojectangularissue-trackerifcgantt-chartganttbug-trackerboardsbcf

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Richard 17f3602771 Merge branch 'dev' into feature/ui-component-table-widgets ... Conflicts: Gemfile.lock app/assets/javascripts/angular/helpers/filter-query-string-builder.js app/assets/javascripts/angular/models/timelines/color.js app/assets/javascripts/angular/models/timelines/historical_planning_element.js app/assets/javascripts/angular/models/timelines/planning_element.js app/assets/javascripts/angular/models/timelines/planning_element_type.js app/assets/javascripts/angular/models/timelines/project.js app/assets/javascripts/angular/models/timelines/project_association.js app/assets/javascripts/angular/models/timelines/project_type.js app/assets/javascripts/angular/models/timelines/reporting.js app/assets/javascripts/angular/models/timelines/status.js app/assets/javascripts/angular/models/timelines/tree_node.js app/assets/javascripts/angular/models/timelines/user.js app/assets/javascripts/select_list_move.js app/assets/javascripts/timelines.js app/assets/javascripts/timelines/TimelineLoader.js app/assets/javascripts/timelines/model/Reporting.js app/assets/javascripts/timelines/ui.js app/views/queries/_columns.html.erb app/views/timelines/_timeline.html.erb app/views/work_packages/_list.html.erb app/views/work_packages/index.html.erb config/locales/de.yml config/locales/en.yml spec/controllers/work_packages_controller_spec.rb		11 years ago
..
environments	Merge branch 'dev' into feature/ui-component-table-widgets	11 years ago
initializers	Merge branch 'dev' into feature/ui-component-table-widgets	11 years ago
locales	Merge branch 'dev' into feature/ui-component-table-widgets	11 years ago
additional_environment.rb.example	copyright header in rb.example files	11 years ago
application.rb	Allow configuring memcache via Configuration	11 years ago
boot.rb	new copyright header #1903	11 years ago
configuration.yml.example	streamlines configuration of relative_url_root	11 years ago
cucumber.yml	new copyright header #1903	11 years ago
database.yml.example	test_psql setup in database.yml.example is a comment now	11 years ago
environment.rb	new copyright header #1903	11 years ago
i18n-js.yml	new copyright header #1903	11 years ago
routes.rb	Merge branch 'dev' into feature/ui-component-table-widgets	11 years ago
settings.yml	Merge remote-tracking branch 'origin/dev' into fix/renaming_issue_tracking	11 years ago