7676 Commits (475a22204e37e9e2fd46542301ca1c750faf924b)

 

All Branches   

Search

Author	SHA1	Message	Date
Martin Czuchra	475a22204e	Fixes controller names in specs.	12 years ago
Martin Czuchra	c285e1ebd8	Changes Color to PlanningElementTypeColor ... Removing the timelines namespace led to this conflict, which should be resolved by prefixing what the color is for. It is for planning element types. This also changes the colors table name and moves the views.	12 years ago
Martin Czuchra	8211667f83	Moves remaining helper out of timelines namespace.	12 years ago
Martin Czuchra	3771a1b5df	Fixes module in module inclusion. ... Extend works on class methods.	12 years ago
Martin Czuchra	62c91d17aa	Restores original migrations. ... This changes everything, again! Changing migrations was not the right way to to do it. Instead, this restores the original migrations and adds a new migration that includes all changes that are needed for the changed models.	12 years ago
Martin Czuchra	5cba510b1f	Updates copyright notice in timelines sources. ... This also fixes some of the broken license headers after the previous merge.	12 years ago
Martin Czuchra	52c26d4bd8	Removes debugger statement introduced in c1bfd520	12 years ago
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
Martin Czuchra	46ffcfc195	Refactors current timelines API into api/v2.	12 years ago
Martin Czuchra	1db1c1fcce	Refactors current REST API into api/v1 ... This is to make room for the timelines API to join as api/v2.	12 years ago
Niels Lindenthal	dc9c85a260	Merge pull request #166 from opf/feature/timelines ... Open-sources timelines.	12 years ago
Martin Czuchra	7963fe3521	Updates copyright notice in timelines sources.	12 years ago
Martin Czuchra	0fcbb60a7c	Adds external timelines library names. ... So they can be excluded when updating the copyright notice.	12 years ago
Nils Kenneweg	531b2494e5	Final merge with the original timelines plugin. ... This includes all features that were added to timelines while the merge with the core was being worked on.	12 years ago
Martin Czuchra	c1bfd5202a	Open-sources timelines. ... This represents the timelines plugin that was merged with the OpenProject core and which had its history squashed. The timelines plugin development was sponsored by; Deutsche Telekom AG <opensource@telekom.de> Requirements engineering and management were provided by; Deutsche Telekom AG <opensource@telekom.de> Finn GmbH <info@finn.de> During the timelines development, the following authors have contributed commits; Martin Czuchra <m.czuchra@finn.de> Nils Kenneweg <n.kenneweg@finn.de> Romano Licker <r.licker@finn.de> Gregor Schmidt <g.schmidt@finn.de> Jens Ulferts <j.ulferts@finn.de> Johannes Wollert <j.wollert@finn.de> Quality Assurance was provided by; Erdem Kabadayi <e.kabadayi@telekom.de> Julia Pape <j.pape@finn.de> Christian Rijke <c.rijke@finn.de> Thomas Vogel <th.vogel@external.telekom.de>	12 years ago
Martin Czuchra	fbf6d308e6	Merge pull request #164 from opf/fix/journals_diff_spec ... increases spec robustness by removing whitespace	12 years ago
Jens Ulferts	7159cd7f9b	increases spec robustness by removing whitespace	12 years ago
Niels Lindenthal	eebd86e236	Merge pull request #163 from opf/fix/gpl ... Fix/gpl	12 years ago
Jens Ulferts	f28dfa91f2	replaces bundled prototype_legacy_helper by gemfile reference	12 years ago
Jens Ulferts	21459a384f	provide every possible file with a short copyright notice ... This was done using the rake task: rake copyright:update	12 years ago
Jens Ulferts	d818f09f9c	adapt copyright rake task to include all own files ... Now includes: * .rb * .rake * .feature * .html.erb * .js(.erb) * .css(.erb) * .api.rsb It should exclude files and directories that we include but for which we do not hold the license.	12 years ago
Martin Czuchra	adcea2eb3e	Adds a copy of the GPL Version 3.	12 years ago
cratz	21ec8c8cee	Merge pull request #158 from opf/feature/rails3_update_dependencies ... Feature/rails3 update dependencies	12 years ago
cratz	e3ef6dd817	Merge pull request #161 from opf/feature/rails3_translations ... Feature/rails3 fix breadcrumb translations	12 years ago
cratz	c9fdd135d5	Merge pull request #159 from opf/feature/rails3_reenable_calendar_menu_item ... reenable calendar menu item	12 years ago
Philipp Tessenow	a833e9a9c4	fix missing calendar translation in breadcrums	12 years ago
Philipp Tessenow	62df73d082	aded test for calendar menu entry	12 years ago
Philipp Tessenow	bf1f1ae515	reenable calendar menu item	12 years ago
Philipp Tessenow	82e3df434c	define translation for WikiControllers default breadcrumb	12 years ago
Philipp Tessenow	fc10504e4a	update guard-rspec	12 years ago
Philipp Tessenow	4150e2644a	update dalli	12 years ago
meeee	2f15f6f363	Merge pull request #156 from opf/feature/rails3_fix_secret_token ... Better secret token handling	12 years ago
Christian Ratz	82fef8e962	exit with error if secret_token ist empty	12 years ago
Christian Ratz	584b58f96a	better handling of secret_token ... - deafult value in test / dev env - possible to set it with env variable - rake task to generate secret_token - fixed ci task for travis	12 years ago
Christian Ratz	d8c181b16e	rake task for generate secret_token ... - adapt session secret rake task for rails3 - added secret_token.rb to .gitignore	12 years ago
Christian Ratz	8b25f10b90	remove secrect_token from ... version control, this should not be checked in	12 years ago
Christian Ratz	c2bef73ec9	fixes testing rake task for production mode ... - require coveralls rake task only in test env similar to the Gemfile	12 years ago
Niels Lindenthal	e4caf9a05b	Update COPYRIGHT_short.rdoc ... Update the copyright information and specify the GPL to version 3.	12 years ago
Niels Lindenthal	518c0cf2f8	Update COPYRIGHT.rdoc ... Update the year of Redmine's copyright	12 years ago
Niels Lindenthal	e06b7bdcbe	Update COPYRIGHT.rdoc ... Update the year of the copyright of the ChiliProject team	12 years ago
Niels Lindenthal	99958af605	Update README.rdoc ... Correct typo	12 years ago
Niels Lindenthal	100e80bee3	Update GPL Version in README.rdoc ... OpenProject is distributed under the GPL version 3.	12 years ago
Niels Lindenthal	48c37a056a	Update the COPYRIGHT.rdoc ... Update the copyright information of OpenProject Add a reference to the copyright of the ChiliProject Team	12 years ago
cratz	524c9e05fd	Merge pull request #152 from opf/feature/fix-edit-time-entry ... FIx url for 'edit time entry' links.	12 years ago
ulferts	1fa0defb5d	Merge pull request #153 from opf/feature/rails3_add_budget_icon ... Added icon for budgets	12 years ago
Christian Rijke	257f6e4400	Add time_entry cucumber tests.	12 years ago
ulferts	e85fbfa655	Merge pull request #155 from opf/feature/rails3_fix_table_css ... Fixed css to show tables in various location within content correctly	12 years ago
Sebastian Schuster	51b50a4bc9	Removed too specific css to make all table header font normal	12 years ago
Sebastian Schuster	01aeaef5ec	Removed unused js-tooltip css	12 years ago
Sebastian Schuster	a3734289cb	Some more css fixes	12 years ago