TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-09-20 09:08:54 +03:00
Code Issues Projects Releases Wiki Activity
1,983 Commits 182 Branches 1,658 Tags 379 MiB
ca9a23f2d6
Commit Graph

1983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Mitasch
ca9a23f2d6 Ember.js: Add assets img + css (ember-hacks.css) to ember admin 
Closes #2276

- Adds the images to `core/client/assets/img`
- Adds css with ember hacks to `core/client/assets/css`
- Configures middleware to provide assets as static files at url `/ghost/ember`
- Adds ember option to assets helper
- Modifies default-ember.hbs to use ember option on asset helper
- Remove inline style definition in editor.hbs
- Modifies .gitignore to include ember-hacks.css (in ignored `core/client/assets/css` folder)
 2014-03-15 00:08:15 +01:00
Hannah Wolfe
7295ef07e1 Merge pull request #2378 from hswolff/ember-fix-watching-files 
Ensure grunt-contrib-watch watches appropriate files for re-building ember admin when files change.
 2014-03-10 22:14:14 +00:00
Hannah Wolfe
c6874a0a44 Merge pull request #2376 from hswolff/ember-history-support 
Add HTML5 pushState support for Ember
 2014-03-10 22:13:39 +00:00
Harry Wolff
7069b5027d Ensure grunt-contrib-watch watches appropriate files 
for re-building ember admin when files change
 2014-03-09 21:35:58 -04:00
Harry Wolff
9983e05535 Add HTML5 pushState support for Ember 
- also updates associated route
 2014-03-09 20:57:13 -04: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
c4d4f66a38 Cleanup more sass/ruby things 2014-03-09 22:19:59 +00:00
Hannah Wolfe
93f411cd55 Merge pull request #2369 from halfdan/bower_all_the_things 
Replace SASS with assets from Ghost-UI
 2014-03-09 21:59:54 +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
18c4d3eb77 Merge pull request #2374 from ebryn/posts-item-view 
Specify `itemView` on the `each` helper rather than nesting a `view` helper
 2014-03-09 21:22:30 +00:00
Erik Bryn
c52a9e83ea Specify itemView on the each helper rather than nesting a view helper. 
This avoids the creation of two views per row, which will make a big difference for large blogs.
 2014-03-09 14:20:15 -07:00
Hannah Wolfe
106ee21cbf Merge pull request #2357 from ErisDS/ember-with-proto 
[Ember.js] merging prototype
 2014-03-09 20:43:08 +00:00
Manuel Mitasch
49ea71ed4f Amend fixtures & put body classes in styleBody mixin 
- Change fixture response of posts route to actual format.
- Extracted classNames logic of routes into style-body mixin.
- Additionally replaced all double-quotes with single-quotes for style conformance.
 2014-03-09 15:30:54 +00:00
Taras Mankovski
a89f38c165 Minor refactoring of the routers: 
- Moved post route under posts resource
- Changed ajax to use ic.ajax.request instead of ic.ajax.raw
 2014-03-07 14:01:27 +00:00
Manuel Mitasch
47bfd046bb Add admin prototype 
issue #2270

- from https://github.com/manuelmitasch/ghost-admin-ember-demo
- Not working properly: added ic-ajax mock in app.js but promise not resolving => loading route always active
 2014-03-07 14:01:26 +00:00
Hannah Wolfe
c356bbd075 Merge pull request #2342 from dsschnau/nocache404 
Nocache404
 2014-03-07 12:51:54 +00:00
Hannah Wolfe
4be10448a0 Adding missing loader.js 2014-03-07 10:14:40 +00:00
Dan Schnau
b13db3a9d2 Do not cache 404 pages 
closes #2334

- remove call to set cache-control in 404 response header
- update unit tests to expect this

Fix up unit tests
 2014-03-06 20:06:07 -05:00
Hannah Wolfe
5473df191a Merge pull request #2345 from JohnONolan/emailfrom 
Update system emails to come from ghost@blog.url
 2014-03-06 21:40:36 +00:00
John O'Nolan
161afbf3c4 Update system emails to come from ghost@blog.url 
Closes #2145
 2014-03-06 12:03:00 +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
Hannah Wolfe
75caeb9341 Bower dependency order OCD 2014-03-05 20:55:11 +00:00
Hannah Wolfe
2c524c1d8e Merge pull request #2321 from polygonix/2320-detect-tag-hbs 2014-03-05 19:49:29 +00:00
Hannah Wolfe
8bfc37bd8e Fixing CodeMirror paths in GruntFile.js 2014-03-05 19:46:43 +00:00
Hannah Wolfe
6189864a22 Merge pull request #2307 from Gudahtt/static-page-validation 
Change validation for posts 'page' attribute
 2014-03-05 18:35:00 +00:00
Hannah Wolfe
7feafb4c5d Merge pull request #2335 from halfdan/bower-maeh 
Remove unused libraries.
 2014-03-05 12:28:03 +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
Polygonix
75ec29197b Merge pull request #1 from halfdan/add-test-tag 
Add test for tag.hbs template.
 2014-03-05 11:57:14 +11:00
Mark Stacey
65b0968f40 Change validation for posts 'page' attribute. 
issue #2305
- changed validation for 'page' to expect '0' or '1', rather than 'true' or
  'false'
- Added a 'can change a post to static page' test
- Added a 'can change a static page to a post' test
 2014-03-04 17:59:00 -03:30
Hannah Wolfe
6deb7616cf Merge pull request #2286 from jondavidjohn/validator-upgrade 
Update validator to 3.4.0
 2014-03-04 21:27:23 +00:00
Jonathan Johnson
e4bb6d08cc Update validator to 3.4.0 
Closes #1379

- Convert to new api usage for both server-side and client-side
- Provide way require a negative response for boolean methods in
  default-settings.json
- Add field validation functional tests
  - Settings (General)
    - Title length validation
    - Description length validation
    - postsPerPage, numeric, min, max
  - Settings (User)
    - Bio Length validation
    - Location length validation
    - Url validation
  - Login
    - Email validation
  - Editor
    - Title required validation
 2014-03-04 13:54:24 -07:00
Hannah Wolfe
8d3a54527b jsHint fixes 
issue #2294

- bad merge order = broken tests
 2014-03-04 20:32:04 +00:00
Hannah Wolfe
585ea121a4 Merge pull request #2294 from shashankmehta/apps-config 
Shifts app UI behind config option
 2014-03-04 20:21:13 +00:00
Hannah Wolfe
3dbf51e9a5 Merge pull request #2326 from halfdan/bower 
Switch to bower for client assets.
 2014-03-04 20:19:14 +00:00
Fabian Becker
cd74b0e232 Switch to bower for client assets. 
fixes #2272
- Remove libraries from shared/vendor
- Remove libraries from client/assets/vendor
- Add bower to package.json and postinstall
- Add bower.json with dependencies
- Add scripts from bower_components to concat/uglify
- Fix tests
- Serve jquery from /ghost/built/theme/
 2014-03-04 20:09:26 +00:00
Hannah Wolfe
c3865dbb9c Merge pull request #2278 from halfdan/jshint-es6 
Replace JSLint with JSHint.
 2014-03-04 19:26:15 +00:00
Fabian Becker
1a9e91f120 Replace JSLint with JSHint. 
closes #2277
- Added ES6 linting to core/client/
- Fix typeof array comparison
 2014-03-04 15:47:39 +00:00
Fabian Becker
f6021210c6 Add test for tag.hbs template. 
refs #2321
 2014-03-04 13:06:22 +00:00
Hannah Wolfe
c4bf3052e1 Merge pull request #2292 from jgable/requireTree 
Refactor require-tree to not share messages and export parsePackageJson
 2014-03-04 12:20:32 +00:00
Hannah Wolfe
13fa84a8bf Merge pull request #2317 from shashankmehta/settings-rendering-issue 
Prevent settings page from rendering same page twice
 2014-03-04 12:06:25 +00:00
Hannah Wolfe
a11acff4fd Merge pull request #2329 from stenehall/master 
Fix for #2328 - Added check for tag for title
 2014-03-04 12:02:09 +00:00
Johan Stenehall
825ba4fb82 Use tag as title on tag pages 
closes #2328
- added check for tag in coreHelpers.meta_title and use if set
- added test for correct title on tag pages

Rewritting to tag - blogtitle based on comments from PR
 2014-03-04 11:52:27 +01:00
polygonix
97daa2bdec Detect tag.hbs template in themes 
closes #2320
- changed detection from "tag" to "tag.hbs" in "frontend.js" contrroller
 2014-03-03 16:41:37 +11:00
Shashank Mehta
a92c8085c5 Shifts app UI behind config option 
Closes #2287
- adds helper for checking whether to show apps UI or not
- hides app UI from settings page
 2014-03-03 02:52:30 +05:30
Shashank Mehta
ab2656960a Prevent settings page from rendering same page twice 
Closes #2316
- There was a check to prevent rerendering of same content pane but it wasn't working
- Fixed the check for this
 2014-03-03 02:30:09 +05:30
Hannah Wolfe
383da31484 Merge pull request #2311 from stenehall/master 
Fixing typo in allowedSections for allowed pages under settings
 2014-03-02 17:26:16 +00:00
Johan Stenehall
be8b9cf092 Fixing typo in allowedSections for allowed pages under settings 2014-03-02 12:46:03 +01:00
Hannah Wolfe
b84c8a4726 Merge pull request #2297 from javorszky/iss2296 
Update link to clean up history in contributing.md
 2014-03-01 10:17:47 +00:00
Hannah Wolfe
055237b8f2 Merge pull request #2295 from seanhellwig/issue2290 
Add plugin icons to Apps menu item in Ghost settings
 2014-03-01 10:11:42 +00:00
Sean Hellwig
561ea0edbb Add plugin icons to Apps menu item in Ghost settings 
closes #2290
- added css entry in settings.scss for to display plugin icon for apps menu item
- remove unused css entry for .plugins in settings.scss
 2014-03-01 01:13:19 -08:00