Hannah Wolfe
9415a232b0
Merge branch 'master' into ember
...
Conflicts:
.gitignore
.npmignore
Gemfile.lock
Gruntfile.js
bower.json
core/clientold/assets/fonts/icons.dev.svg
core/clientold/assets/fonts/icons.eot
core/clientold/assets/fonts/icons.svg
core/clientold/assets/fonts/icons.ttf
core/clientold/assets/fonts/icons.woff
core/clientold/assets/sass/ie.scss
core/clientold/assets/sass/layouts/auth.scss
core/clientold/assets/sass/layouts/editor.scss
core/clientold/assets/sass/layouts/errors.scss
core/clientold/assets/sass/layouts/manage.scss
core/clientold/assets/sass/layouts/plugins.scss
core/clientold/assets/sass/layouts/settings.scss
core/clientold/assets/sass/layouts/users.scss
core/clientold/assets/sass/modules/animations.scss
core/clientold/assets/sass/modules/breakpoint.scss
core/clientold/assets/sass/modules/breakpoint/_context.scss
core/clientold/assets/sass/modules/breakpoint/_helpers.scss
core/clientold/assets/sass/modules/breakpoint/_no-query.scss
core/clientold/assets/sass/modules/breakpoint/_parsers.scss
core/clientold/assets/sass/modules/breakpoint/_respond-to.scss
core/clientold/assets/sass/modules/breakpoint/parsers/_double.scss
core/clientold/assets/sass/modules/breakpoint/parsers/_query.scss
core/clientold/assets/sass/modules/breakpoint/parsers/_resolution.scss
core/clientold/assets/sass/modules/breakpoint/parsers/_single.scss
core/clientold/assets/sass/modules/breakpoint/parsers/_triple.scss
core/clientold/assets/sass/modules/breakpoint/parsers/double/_default-pair.scss
core/clientold/assets/sass/modules/breakpoint/parsers/double/_default.scss
core/clientold/assets/sass/modules/breakpoint/parsers/double/_double-string.scss
core/clientold/assets/sass/modules/breakpoint/parsers/resolution/_resolution.scss
core/clientold/assets/sass/modules/breakpoint/parsers/single/_default.scss
core/clientold/assets/sass/modules/breakpoint/parsers/triple/_default.scss
core/clientold/assets/sass/modules/forms.scss
core/clientold/assets/sass/modules/global.scss
core/clientold/assets/sass/modules/icons.scss
core/clientold/assets/sass/modules/mixins.scss
core/clientold/assets/sass/modules/normalize.scss
core/clientold/assets/sass/screen.scss
2014-03-09 23:04:36 +00:00
Hannah Wolfe
c4d4f66a38
Cleanup more sass/ruby things
2014-03-09 22:19:59 +00:00
Fabian Becker
921ceb7be7
Replace SASS with assets from Ghost-UI
...
closes #2368
- Remove Ruby dependency (Gemfiles)
- Remove sass/fonts from core/client/assets/
- Add copy task to Gruntfile to copy over ghost-ui assets
- Install Ghost-UI via bower
- Changed .npmignore/.gitignore
- Remove grunt-contrib-sass dependency
- Remove mentions of Ruby in CONTRIBUTING.md
2014-03-09 22:50:37 +01:00
Hannah Wolfe
31f41822e0
Merge branch 'master' into ember
...
Conflicts:
.gitignore
Gruntfile.js
bower.json
core/client/assets/lib/showdown/extensions/ghostdown.js
core/client/assets/vendor/showdown/extensions/ghostdown.js
core/client/router.js
core/clientold/assets/vendor/chart.min.js
core/clientold/assets/vendor/codemirror/addon/mode/overlay.js
core/clientold/assets/vendor/codemirror/codemirror.js
core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js
core/clientold/assets/vendor/codemirror/mode/gfm/index.html
core/clientold/assets/vendor/codemirror/mode/gfm/test.js
core/clientold/assets/vendor/codemirror/mode/markdown/index.html
core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js
core/clientold/assets/vendor/codemirror/mode/markdown/test.js
core/clientold/assets/vendor/countable.js
core/clientold/assets/vendor/fastclick.js
core/clientold/assets/vendor/icheck/jquery.icheck.min.js
core/clientold/assets/vendor/jquery.hammer.min.js
core/clientold/assets/vendor/nprogress.js
core/clientold/assets/vendor/packery.pkgd.min.js
core/clientold/assets/vendor/showdown/extensions/ghostdown.js
core/clientold/assets/vendor/showdown/showdown.js
core/clientold/assets/vendor/validator-client.js
core/test/unit/client_ghostdown_spec.js
core/test/unit/client_showdown_int_spec.js
2014-03-05 23:10:44 +00:00
Fabian Becker
e5ead739a1
Remove unused libraries.
...
refs #2326
- Remove unused libraries from core/client/assets/vendor/
- Add folder to .gitignore
- bower install is now handled by grunt init
2014-03-05 10:20:56 +00:00
Harry Wolff
4334c3deb6
Move Ember Admin to use es6 modules
...
- adds required dependencies to package.json
and to bower.json
- added required Grunt tasks to transpile and
concat ember admin files
2014-02-26 23:48:54 -05:00
Hannah Wolfe
bee58922b2
Rename client -> clientold
...
issue #2271
- should allow development of new admin UI whilst still having access to the old ui
2014-02-27 00:52:04 +00:00
Harry Wolff
d7815f4dff
Update package.json for publishing to npm
...
address #2078
- removes private: true flag from package.json
- created .npmignore file and moved all of buildGlob
file patterns into here, negating all patterns as
the npmignore file defines what is to be excluded
and not included.
- gruntfile now uses the inverse of the .npmignore file
to define what files to include in a release
2014-02-23 09:38:47 -05:00
