13202 Commits (914d2e346d94d41a6e5e8220695a2afaf504a30e)

 

All Branches   

Search

Author	SHA1	Message	Date
Alex Coles	914d2e346d	Merge branch 'feature/ui-components-test-architecture-bower' into feature/ui-components-test-architecture-mocha-tests ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: mocha/factories/color_factory.js mocha/factories/planning_element_factory.js mocha/factories/project_association_factory.js mocha/factories/project_factory.js mocha/factories/project_type_factory.js mocha/factories/reporting_factory.js mocha/factories/status_factory.js mocha/factories/timelines_factory.js mocha/factories/type_factory.js mocha/factories/user_factory.js mocha/tests/project_test.js	11 years ago
Alex Coles	2600e039ac	Merge branch 'feature/ui-component-table-widgets-merged' into feature/ui-components-test-architecture-bower ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: .travis.yml Gemfile Gemfile.lock app/assets/javascripts/application.js.erb	11 years ago
Alex Coles	bed46360c4	Merge branch 'dev' into feature/ui-component-table-widgets-merged ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: Gemfile Gemfile.lock app/assets/javascripts/angular/helpers/svg-helper.js app/assets/javascripts/timelines.js app/assets/javascripts/timelines/FilterQueryStringBuilder.js app/assets/javascripts/timelines/TimelineLoader.js app/assets/javascripts/timelines/model/CustomFields.js app/assets/javascripts/timelines/model/Reporting.js app/assets/javascripts/timelines/ui.js features/work_packages/list_sums.feature	11 years ago
Till Breuer	e4a8483344	Merge pull request #1018 from opf/feature/ui-component-table-widgets-merged-spec-fixes ... Feature/ui component table widgets merged spec fixes	11 years ago
Alex Coles	c35d670d06	Commit updated Gemfile.lock ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	d69c5618db	Configure Travis to install Bower without sudo ... * Attempt to use nvm to specify compatible node. Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	52bfaddf92	Config Travis to build *test-architecture branches ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	06cacbebac	Configure Travis to install Bower with npm ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	9bf1265627	Invoke bower:install on Travis CI runs ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	fb23e44468	Add basic bower:install Rake wrapper ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	8447e5ce6f	Merge branch 'feature/ui-components-test-architecture-bower' into feature/ui-components-test-architecture-mocha-tests ... Signed-off-by: Alex Coles <alex@alexbcoles.com> Conflicts: bower.json	11 years ago
Alex Coles	1fa91639ea	Persist dependency resolutions to bower.json ... Conflicting dependencies need further investigation. For the time-being, this allows for a non-interactive `bower install`. Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	91e6e9259f	Make openproject-ui_components a GitHub dependency ... openproject-ui_components is pending publishing as a Bower component (Task #5144) Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	bb2de5632f	Revert "Temporarily add a local relative part to register ui components" ... This reverts commit 7743b0e9cf.	11 years ago
Alex Coles	5bcca76827	Require assets with logical paths, where possible ... The latest versions of Sprockets parse `bower.json` and set-up the logical path to be translated to the source file specified in the 'main' property. N.B. - the path for the main file of older versions of angular-ui-date is incorrect. See 346e1e0126. - this is not yet working with Caret.js. - 2.2.2.backport2 had broken support for Bower projects. See 960e2f5. Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	8e56bdbcb8	Minor style tidy-up setting config.assets.paths ... `Rails.root` is a `Pathname` object. HT: @plexus (https://twitter.com/plexus/status/445233243164782592) Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
manwithtwowatches	bbb9deb9d3	Merge pull request #1021 from opf/feature/ui-components-timeline-custom-fields ... Feature/ui components timeline custom fields	11 years ago
Richard	c266eb99b1	Added back in specs i was too lazy to reimplement.	11 years ago
Till Breuer	5635b4139f	Fix variable naming and move some code	11 years ago
Till Breuer	11ee346cb4	Only set watchers on custom fields for custom field columns	11 years ago
Till Breuer	b4e47cd173	Remove unnecessary variable declaration	11 years ago
Till Breuer	7ce0831085	Fix path selector in cucumber timeline steps	11 years ago
Till Breuer	37e8443951	Display custom field columns in timeline table	11 years ago
Till Breuer	aa4cfc0680	Wrap up timeline column rendering in a directive	11 years ago
Till Breuer	cdfd3d1dfb	Use custom field helper in timeline.js	11 years ago
Till Breuer	f8dc624ab0	Add timeline column name directive, fix custom field column header	11 years ago
cratz	ddc3ea2df5	Merge pull request #1031 from opf/fix/bump_core_version_for_next_release ... Bumped core version to next minor release	11 years ago
Alex Coles	0369eb2c96	Merge branch 'feature/ui-components-test-architecture-bower' into feature/ui-components-test-architecture-mocha-tests	11 years ago
Alex Coles	fcbaa3a022	Merge branch 'feature/ui-component-table-widgets-merged' into feature/ui-components-test-architecture-bower	11 years ago
Alex Coles	a07abf5b36	Use Bower-installed jQuery in JS tests ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	8593e2ef46	Remove unused JS libraries from Mocha HTML page ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	76b834349a	Fix PlanningElement test fail after Mocha upgrade ... Switch to `be.empty` assertion. Deep Equals behaviour appears to have changed: https://github.com/chaijs/chai/blob/master/ReleaseNotes.md#deep-equals Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	67882b664f	Use Bower-installed Mocha, Chai in JS tests ... * Keep using our own customised rosie.js (see 596c93a) Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Philipp Tessenow	57981b20fc	update changelog - fix #5214	11 years ago
Philipp Tessenow	770d0495f1	Merge pull request #1027 from opf/fix/more_planning_elements_api_whitelisting ... Added whitelisting of watchers and time entries for planning elements	11 years ago
Alex Coles	6d4a6ef3d8	Use more descriptive variable names in model tests ... Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Alex Coles	82920a3011	Rehabilitate Mocha JS tests, porting to Angular ... Fix up paths to Timeline JavaScripts. Make Rosie work with Angular specs: initial solution employs `angular.injector()` to lookup constructors needed for factories. * Add skeleton tests for TimelinesController * Add skeleton tests for other models (Filter, Query, Sortation) Signed-off-by: Alex Coles <alex@alexbcoles.com>	11 years ago
Sebastian Schuster	8cdad31dc0	Bumped core version to next minor release	11 years ago
Sebastian Schuster	5c92911546	Fixed permitted params to be more robust against missing parameters	11 years ago
sschu	8f7b5f4719	Update CHANGELOG.md	11 years ago
sschu	592e2b02c2	Merge pull request #1030 from netfighter/fix/on-the-fly-version-creation ... Meets bug #2401: New target version cannot be created from work package view	11 years ago
Ion Biziiac	2108a45d42	Fixes the routing bug of the on-the-fly version create link in the work package form	11 years ago
Till Breuer	c229a21e53	Merge pull request #1011 from opf/feature/ui-component-table-widgets-merged-timeline-timeline-chart-header-fixes ... Fix horizontal rule under timeline chart headers	11 years ago
Sebastian Schuster	2500e1ea01	Fixes on the fly version creation	11 years ago
Sebastian Schuster	aa1e4a706f	Added whitelisting of watchers and time entries for planning elements	11 years ago
Johannes Wollert	27d63d89c3	changelog entry for #4087	11 years ago
Johannes Wollert	ba32d5cd1c	Merge pull request #989 from opf/fix/type_list_flash ... [FIX] Type list flash	11 years ago
Hagen Schink	3dac346908	Fix test	11 years ago
sschu	43ab4408bd	Update CHANGELOG.md	11 years ago
sschu	0f57420574	Merge pull request #1019 from netfighter/bugfix/5208_invalid_data_clears_the_form ... Fixes 'due date' validation when 'start date' is not present in a custom form	11 years ago