Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Grunt with Gulp #435

Merged
merged 28 commits into from Apr 27, 2015
Merged

Replace Grunt with Gulp #435

merged 28 commits into from Apr 27, 2015

Conversation

Voles
Copy link
Member

@Voles Voles commented Apr 27, 2015

Grunt has been replaced with Gulp before (#341), but has been reverted since there was a 'general revert'. This PR brings Gulp back.

Niels Dequeker added 27 commits April 27, 2015 15:00
(cherry picked from commit 4ae1353)
(cherry picked from commit 1ddea0b)
(cherry picked from commit db7b7e9)
- concat files before uglify
(cherry picked from commit 0b8487b)
- remove non-working examples
- code cleanup
(cherry picked from commit 05419eb)
(cherry picked from commit 5b9dd35)
(cherry picked from commit 9161fb3)
(cherry picked from commit cf723cc)
(cherry picked from commit fb2b5d4)
- replaced with the examples directory
Conflicts:
	demo/dist/angular-ui-tree.js
	demo/dist/angular-ui-tree.min.js
	demo/index.html
	demo/test.html
	dist/angular-ui-tree.js
	dist/angular-ui-tree.min.js
	source/directives/uiTree.js
	source/directives/uiTreeNodes.js
- replaced with the examples directory
@Voles Voles mentioned this pull request Apr 27, 2015
- trigger Travis build
@Voles
Copy link
Member Author

Voles commented Apr 27, 2015

Something's wrong with Travis, the push build won't finish. The PR build is successful, so I'll merge this one.

Voles pushed a commit that referenced this pull request Apr 27, 2015
@Voles Voles merged commit 8260883 into master Apr 27, 2015
@Voles Voles deleted the replace-grunt-with-gulp branch April 27, 2015 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant