7896 Commits (b4ebb6b189b9c26813163345360f4ad01c2c5133)

 

All Branches   

Search

Author	SHA1	Message	Date
Hagen Schink	b4ebb6b189	Merge branch 'feature/rails3' into feature/rails3_sti ... Conflicts: app/controllers/timelog_controller.rb app/helpers/application_helper.rb app/models/alternate_date.rb app/models/available_project_status.rb app/models/default_planning_element_type.rb app/models/enabled_planning_element_type.rb app/models/planning_element.rb app/models/planning_element_type.rb app/models/planning_element_type_color.rb app/models/project_association.rb app/models/project_type.rb app/models/query.rb app/models/reporting.rb app/models/scenario.rb app/models/timeline.rb app/views/planning_elements/_form.html.erb features/issues/issue_edit.feature features/step_definitions/timelines_given_steps.rb features/step_definitions/timelines_then_steps.rb features/step_definitions/timelines_when_steps.rb features/support/paths.rb lib/timestamps_compatibility.rb spec/controllers/timelines_planning_elements_controller_spec.rb spec/factories/timelines_planning_element_journal_factory.rb spec/models/alternate_date_spec.rb spec/models/planning_element_spec.rb spec/views/api/v2/planning_elements/_planning_element_api_rsb_spec.rb test/integration/api_test/time_entries_test.rb	12 years ago
Hagen Schink	a65c7df874	Merge pull request #175 from opf/feature/api-refactoring ... Feature/api refactoring	12 years ago
Jens Ulferts	7a825643c5	allows pagination helper to not have a container	12 years ago
Christian Rijke	0b7ceb148b	Merge pull request #200 from opf/feature/rails3_changeable_footer ... Changeable footer	12 years ago
Hagen Schink	623bce3ed3	Rename legacy databases	12 years ago
Hagen Schink	3452745b8a	Use legacy issue implementation for migration	12 years ago
Hagen Schink	a6f83f1d3c	Adapt references to work package	12 years ago
Hagen Schink	a9faa617c7	Rename migration	12 years ago
Hagen Schink	94472f5d60	Rename work unit custom field	12 years ago
Hagen Schink	8c99954f7e	Rename work unit to work package	12 years ago
Hagen Schink	426cbf0cab	Rename time entry's work unit reference	12 years ago
Christian Ratz	a2e69908e1	Changeable footer ... - adds OpenProject::Footer object - added small padding right for footer	12 years ago
meeee	b97d32f021	Merge pull request #199 from opf/feature/rails3_update_test_documentation ... Add instructions on running specs; add tips	12 years ago
Philipp Tessenow	6cda041039	expand RUNNING_TESTS.md	12 years ago
Hagen Schink	e1421f3c11	Create work_units table migration	12 years ago
Hagen Schink	872eb35ef1	Introduced default value	12 years ago
Hagen Schink	ead8955b76	Remove unclear test asserts	12 years ago
Hagen Schink	05f2f300fc	Introduce work unit permissions	12 years ago
Philipp Tessenow	aea85b3536	Merge pull request #197 from opf/feature/rails3_fix_translations ... [OPF#575, 1096] Feature/rails3 fix translations	12 years ago
Philipp Tessenow	ea1175f6b0	Merge pull request #192 from opf/features/rails3_upgrade-doc ... Update the link to the upgrade information doc	12 years ago
Nils Kenneweg	15b2d21246	Merge pull request #120 from opf/feature/jquery-ajax-indicator ... Feature/jquery ajax indicator	12 years ago
Nils Kenneweg	dcc0e3db59	Merge remote-tracking branch 'origin/feature/rails3' into feature/jquery-ajax-indicator ... Conflicts: app/assets/javascripts/application.js	12 years ago
Nils Kenneweg	10cb85dbbe	comment.	12 years ago
Martin Czuchra	18a19ed46b	Removes remaining html responses.	12 years ago
Nils Kenneweg	c99ce32465	Revert "remove obsolete prototype indicator code, as the jquery one seems to work better" ... I revert this for now until we are sure there will be no problems with this code. This reverts commit 58dba65d36.	12 years ago
Christian Rijke	0ad9fbe772	Merge branch 'feature/rails_3_ajax_session_loss' into feature/rails3 ... Conflicts: features/step_definitions/general_steps.rb	12 years ago
Jens Ulferts	217c8e09b4	Revert "Merge pull request #60 from opf/feature/select2-rails-gem" ... This reverts commit fb55bb4e53, reversing changes made to db03e70b53.	12 years ago
Hagen Schink	54edd87dd6	Re-implement watcher deletion	12 years ago
Hagen Schink	2c2c1f8a3e	Handle different change column names	12 years ago
Sebastian Schuster	342357b790	Fixed missing translation for subproject issue filter	12 years ago
Hagen Schink	8baacde427	Fix tests	12 years ago
Hagen Schink	82d2400cf0	Let issues work via STI	12 years ago
Sebastian Schuster	1daf481699	Fixed missing translation for view calendar permission	12 years ago
Sebastian Schuster	8d0a8e33a3	Fixed missing translation for workflow controller	12 years ago
Sebastian Schuster	e1f9b0ec15	Fixed missing translation for journal log description diff	12 years ago
Martin Czuchra	35fa5bd4d3	Merge remote branch opf/feature/rails3 into feature/api-refactoring	12 years ago
Martin Czuchra	e0fb8460f4	Reduces code duplication in ApiControllers. ... Methods for controller name changes in before filters (for permission checks) now generated dynamically, class methods moved to their own module.	12 years ago
Johannes Wollert	fb55bb4e53	Merge pull request #60 from opf/feature/select2-rails-gem ... remove vendored select2 in favor of select2-rails gem	12 years ago
Christian Ratz	db03e70b53	udpated OpenProject special version ... to pre4	12 years ago
sschu	e52f416f8e	Merge pull request #189 from opf/feature/rails3_fix_disabled_fields_on_issue_new ... Feature/rails3 fix disabled fields on issue new	12 years ago
Nils Kenneweg	aea1956576	Merge pull request #193 from opf/feature/rails3_fix_select2_xss ... Fix XSS in select2 fields	12 years ago
Christian Ratz	303ec4a695	fixed some typos for disabled issue attributes	12 years ago
Martin Czuchra	39598a1b82	Moves timelines cukes into properly named folders. ... No more grouping of timelines features into one folder.	12 years ago
Michael Frister	0b3043d222	Fix XSS in timelines select2 fields	12 years ago
sschu	61bbe3f0e0	Merge pull request #190 from opf/feature/rails3_drop_translations_we_cannot_support_at_the_moment ... Feature/rails3 drop translations we cannot support at the moment	12 years ago
Martin Czuchra	58be913471	Includes Api::V2::ApiController include. ... AuthenticationController and PlanningElementStatusesController were missing the ApiController include.	12 years ago
Martin Czuchra	cbe7065785	Fixes modal url generation once more. ... The previous fix was not sufficient in fixing the cukes.	12 years ago
Martin Czuchra	8ed947e2e8	Disables API on reported project status controller.	12 years ago
Martin Czuchra	ab78885d30	Disables API on project associations controller.	12 years ago
Martin Czuchra	11516673fa	Disables API on planning element type colors controller.	12 years ago