Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity
2363 commits 226 branches 1704 tags 582 MiB
Commit graph

2363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hannah Wolfe
22fe020d7c Merge pull request #2397 from manuelmitasch/ember-add-assets 
Ember.js: Add assets img + css (ember-hacks.css) to ember admin
 2014-03-15 18:48:50 +00:00
Hannah Wolfe
382ddb148b Merge pull request #2388 from manuelmitasch/ember-login 
Ember.js: User fixtures + injection + login
 2014-03-15 18:27:04 +00:00
John O'Nolan
91ad372c36 Merge pull request #2402 from halfdan/watch-ghost-ui 
Watch changes in Ghost-UI
 2014-03-15 18:15:46 +01:00
Fabian Becker
c612ca2136 Watch changes in Ghost-UI 
refs TryGhost/Ghost-UI#18
- Add bower_components/ghost-ui to grunt watch
 2014-03-15 17:49:43 +01:00
Hannah Wolfe
2d4c6647b2 Merge pull request #2401 from JohnONolan/fix-modal 
Get rid of old modal types
 2014-03-15 16:16:17 +00:00
John O'Nolan
18be7a8999 Get rid of old modal types 
Fixes TryGhost/Ghost-UI/issues/17
 2014-03-15 17:12:49 +01:00
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
4907265019 Merge pull request #2394 from JohnONolan/ios-lol 
Moar iOS mobile friendly fandango
 2014-03-14 11:48:56 +00:00
Hannah Wolfe
caa729e86a Merge pull request #2395 from mattse/mattse#2273 
Added functional tests for editor: tag editor, image uploads, post settings
 2014-03-14 11:48:37 +00:00
Hannah Wolfe
7f1721d8f0 Merge pull request #2392 from mattse/issue#2273 
Added functional test for uploading image/cover in settings
 2014-03-14 11:47:51 +00:00
mattse
1d5a8ce718 Added functional tests for editor: tag editor, image uploads, post settings 
references #2273
- test tag creation and tag deletion
- tests image uploader appears after typing `![]()` in editor
- tests image URL matches url inside `![](url)`
- tests all input elements of post settings menu
 2014-03-14 03:11:26 -04:00
John O'Nolan
8ea0b8a5d1 Moar iOS mobile friendly fandango 
* Minimalise up in this what http://visuellegedanken.de/2014-03-13/viewport-meta-tag-minimal-ui/
* Webapp capable all over the hello
* Consistent self-closing meta tags and shit

This needs to be merged into the ember branch. Probably.
 2014-03-13 23:47:46 +01:00
John O'Nolan
b605f8b75a Update copyright 2014-03-13 22:43:05 +01:00
Hannah Wolfe
33c2b62bb6 Merge pull request #2393 from robgraeber/copyright-year 
Updating copyright range
 2014-03-13 21:36:30 +00:00
Hannah Wolfe
60e316581a Merge pull request #2370 from halfdan/2062-robots 
Serve default robots.txt
 2014-03-13 21:30:04 +00:00
Hannah Wolfe
d463b34ef5 Merge pull request #2341 from stenehall/tag_based_rss_feeds 
Rss support for tags
 2014-03-13 21:16:10 +00:00
Fabian Becker
c3417fe090 Serve default robots.txt 
closes #2062
- Server robots.txt from theme if available
- Serve default robots.txt from /core/shared/ otherwise
- Added tests for default robots.txt
 2014-03-13 21:31:41 +01:00
Rob Graeber
959c018fab Updating copyright range 
Updating the copyright year to be a range. :-)
Otherwise the license wouldn't explicit cover the older versions you've made.
 2014-03-13 09:46:24 -07:00
Johan Stenehall
4556e1df0a Rss support for tags 
closes #2260
- added routes for /tag/:slug/rss and /tag/:slug/rss/:page
- added support for tag in the rss controller
- added route tests for each extra case
- fixing a tiny typo in some test descriptions
 2014-03-13 00:12:41 +01:00
mattse
36d38e5c81 Added functional test for uploading image/cover in settings 
references #2273
- added a test that clicks on both upload (image/cover) buttons and tests the same testing function on them since both modals are exactly the same
- the testing function checks for the '.js-drop-zone.image-uploader' selector, then clicks accept, and tests that a blank success notification appears
- shifted the test email test validation upwards so the ordering of tests matches the ordering of the UI elements
 2014-03-12 17:41:59 -04:00
Hannah Wolfe
a806f3e097 Updating ghost-ui 2014-03-12 21:29:36 +00:00
Manuel Mitasch
dddae8e257 Ember.js: User fixtures + injection + login 
* Adding **user fixtures** for signin

* Adds an initializer for the **current logged in user**.
The created singleton object is injected into all controllers + routes.
It can be used inside routes + controllers with this.get('user').
For simple development the object is instanciated with a userFixture.
Once a proper login and api mock is in place, the fixture needs to be removed.

* Added **route 'login'** on url '/ghost/ember/signin'
* Added authenticated route with an error hook that redirects to the login route, if status 401 (unauthorized) is returned from REST API.
* All "secure" routes now extend from authenticated route
* Add /ghost/ember to noAuthNeeded routes in middleware
 2014-03-12 19:26:47 +01:00
Hannah Wolfe
94f54fe997 Merge pull request #2386 from manuelmitasch/add-bowerrc 
Adding .bowerrc
 2014-03-11 16:14:33 +00:00
Hannah Wolfe
41dc833f19 Merge pull request #2225 from hswolff/ghost-startup 
Add promise to ghost startup process to allow
 2014-03-11 15:52:06 +00:00
Manuel Mitasch
373c798b8d Adding .bowerrc 
If no .bowerrc file is found in the current folder it seems to lookup if one exists in parent folders. Thus, we need to use .bowerrc in order to avoid problems.
 2014-03-11 16:50:29 +01:00
Harry Wolff
3e21940b18 Add promise to ghost startup process to allow 
hooking into when ghost has finished loading

addresses item 9 in #2078
and makes progress on #2182

- has files that startup ghost return a promise
 that is resolved once ghost has finished loading
- moves getSocket into config file
- removes models.reset() as it's not used anywhere
- update functions in server startup
- remove unused version hash variable
 2014-03-11 11:41:45 -04:00
Hannah Wolfe
6ec57d3173 Merge pull request #2318 from knunery/fix-2313 
Blog post titles will now be properly escaped in rss (xml) feeds.
 2014-03-11 15:12:53 +00:00
Hannah Wolfe
0916a96dee Merge pull request #2383 from JohnONolan/clean-markdowntips 
Clean up markdown help modal
 2014-03-10 22:41:23 +00: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
Kyle Nunery
c917c0f0eb Blog post titles will now be properly escaped in rss (xml) feeds (reopens #715) 
Closes #2313
 2014-03-10 11:45:34 -04:00
John O'Nolan
dd2a1dd639 Clean up markdown help modal 
* Shorter, more user friendly.
* See #1463 - Not fixing in any way, just related.
 2014-03-10 16:33:46 +01:00
Hannah Wolfe
c1ba89c120 Bower dependency cleanup 
issue #2272

- handlebars version should match node (1.3.0)
- iCheck isn't used
 2014-03-10 06:15:30 +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