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.

Martin Czuchra 1fb38126a0 Merge commit 'feature/rails3' into feature/better-api-refactoring ... Conflicts: app/assets/javascripts/timelines_select_boxes.js app/controllers/authentication_controller.rb app/controllers/colors_controller.rb app/controllers/planning_element_journals_controller.rb app/controllers/planning_element_statuses_controller.rb app/controllers/planning_element_types_controller.rb app/controllers/planning_elements_controller.rb app/controllers/project_associations_controller.rb app/controllers/project_types_controller.rb app/controllers/reported_project_statuses_controller.rb app/controllers/reportings_controller.rb app/controllers/scenarios_controller.rb app/controllers/timelines/timelines_principals_controller.rb app/controllers/timelines/timelines_projects_controller.rb app/controllers/timelines_controller.rb app/models/alternate_date.rb app/models/color.rb app/models/enabled_planning_element_type.rb app/models/planning_element.rb app/models/planning_element_scenario.rb app/models/planning_element_status.rb app/models/planning_element_type.rb app/models/project_association.rb app/models/project_type.rb app/models/reported_project_status.rb app/models/reporting.rb app/models/scenario.rb app/models/timeline.rb app/models/timelines/available_project_status.rb app/models/timelines/default_planning_element_type.rb app/views/colors/confirm_destroy.html.erb app/views/colors/edit.html.erb app/views/colors/index.html.erb app/views/colors/new.html.erb app/views/planning_element_types/confirm_destroy.html.erb app/views/planning_element_types/edit.html.erb app/views/planning_element_types/index.html.erb app/views/planning_element_types/new.html.erb app/views/planning_elements/confirm_destroy.html.erb app/views/planning_elements/confirm_destroy_permanently.html.erb app/views/planning_elements/confirm_move_to_trash.html.erb app/views/planning_elements/edit.html.erb app/views/planning_elements/index.html.erb app/views/planning_elements/new.html.erb app/views/planning_elements/recycle_bin.html.erb app/views/planning_elements/show.html.erb app/views/project_associations/confirm_destroy.html.erb app/views/project_associations/edit.html.erb app/views/project_associations/index.html.erb app/views/project_associations/new.html.erb app/views/project_types/confirm_destroy.html.erb app/views/project_types/edit.html.erb app/views/project_types/index.html.erb app/views/project_types/new.html.erb app/views/reportings/confirm_destroy.html.erb app/views/reportings/edit.html.erb app/views/reportings/index.html.erb app/views/reportings/new.html.erb app/views/reportings/show.html.erb app/views/scenarios/confirm_destroy.html.erb app/views/scenarios/edit.html.erb app/views/scenarios/new.html.erb app/views/timelines/_comparison.html.erb app/views/timelines/_general.html.erb app/views/timelines/_vertical_planning_elements.html.erb app/views/timelines/confirm_destroy.html.erb app/views/timelines/timelines_colors/index.api.rsb app/views/timelines/timelines_colors/show.api.rsb app/views/timelines/timelines_planning_element_statuses/show.api.rsb app/views/timelines/timelines_planning_element_types/show.api.rsb app/views/timelines/timelines_planning_elements/_edit.html.erb app/views/timelines/timelines_planning_elements/_table_header.html.erb app/views/timelines/timelines_planning_elements/confirm_destroy_all.html.erb app/views/timelines/timelines_planning_elements/confirm_restore_all.html.erb app/views/timelines/timelines_project_associations/show.api.rsb app/views/timelines/timelines_project_types/show.api.rsb app/views/timelines/timelines_projects/show.api.rsb app/views/timelines/timelines_reported_project_statuses/show.api.rsb app/views/timelines/timelines_reportings/show.api.rsb app/views/timelines/timelines_scenarios/show.api.rsb app/views/timelines/timelines_timelines/_form.html.erb db/migrate/20130409133709_create_timelines_available_project_statuses.rb db/migrate/20130409133711_create_timelines_enabled_planning_element_types.rb db/migrate/20130409133712_create_timelines_default_planning_element_types.rb db/migrate/20130409133720_add_deleted_at_to_timelines_planning_elements.rb lib/extended_http.rb lib/hooks/activity_index_head_hook.rb lib/hooks/view_projects_form_hook.rb lib/nested_attributes_for_api.rb lib/timelines/hooks.rb lib/timelines/pagination.rb lib/timestamps_compatibility.rb spec/controllers/timelines_projects_controller_spec.rb spec/factories/timelines_alternate_date_factory.rb spec/factories/timelines_available_project_status_factory.rb spec/factories/timelines_default_planning_element_type_factory.rb spec/factories/timelines_enabled_planning_element_type_factory.rb spec/factories/timelines_planning_element_journal_factory.rb spec/factories/timelines_project_factory.rb		12 years ago
..
_form.html.erb	Merge commit 'feature/rails3' into feature/better-api-refactoring	12 years ago
_index.html.erb	Merge commit 'feature/rails3' into feature/better-api-refactoring	12 years ago
confirm_destroy.html.erb	Merge commit 'feature/rails3' into feature/better-api-refactoring	12 years ago
edit.html.erb	Merge commit 'feature/rails3' into feature/better-api-refactoring	12 years ago
new.html.erb	Merge commit 'feature/rails3' into feature/better-api-refactoring	12 years ago