Hannah Wolfe
|
d1f57a2569
|
Merge branch 'ember'
Conflicts:
Gruntfile.js
core/client/models/post.js
core/client/models/settings.js
core/client/models/user.js
core/client/router.js
package.json
|
2014-05-07 22:28:29 +01:00 |
|
Hannah Wolfe
|
16c8080636
|
Merge branch 'master' into ember
Conflicts:
core/client/models/post.js
|
2014-04-21 18:35:38 +01:00 |
|
Hannah Wolfe
|
c746a88b2e
|
Merge branch 'master' into ember
Conflicts:
Gruntfile.js
core/client/assets/lib/showdown/extensions/ghostdown.js
core/client/views/editor.js
core/clientold/assets/lib/showdown/extensions/ghostdown.js
core/shared/lib/showdown/extensions/ghostimagepreview.js
core/test/unit/showdown_client_integrated_spec.js
core/test/unit/showdown_ghostimagepreview_spec.js
|
2014-04-07 22:26:53 +01:00 |
|
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
|
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 |
|
Harry Wolff
|
2295c9470b
|
Add basic template for Ghost admin in Ember
Inspired and derived from:
https://github.com/taras/Ghost/compare/ember-admin
https://github.com/manuelmitasch/ghost-admin-ember-demo
https://github.com/stefanpenner/ember-app-kit
|
2014-02-26 20:39:45 -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 |
|