Commit Graph

2280 Commits

Author SHA1 Message Date
Hannah Wolfe
c8dff829ee Force preview to scroll to the end
fixes #958, fixes #535

- If the cursor is within the last 5 lines, then scroll to the end of the preview window, rather than using a ratio
2014-03-17 23:23:55 +00:00
Hannah Wolfe
c09c196162 Merge pull request #2398 from ErisDS/cm-refactor
CodeMirror Refactor & Upgrade
2014-03-17 23:22:30 +00:00
Hannah Wolfe
00667f5bd1 Fix undo bug
issue #2436
2014-03-17 23:06:15 +00:00
Hannah Wolfe
6d3cd84309 Upgrade CodeMirror
closes #2108

- upgrade to 4.0.1
- requires removing the deprecated setLine method
2014-03-17 23:06:14 +00:00
Hannah Wolfe
80bdfd7967 Refactor the Ghost Editor
issue #2385, issue #2108

- Separate out the various objects which form the editor into their own
  modules
- Decouple the modules where possible
- Rename and reshuffle bits of modules for consistency
- Minimise public APIs of the modules, and ensure they are consistent
- Add comments to the modules
2014-03-17 23:06:12 +00:00
Declan Cook
4e5351ced4 Fix scoping issue on signup
closes #2429
2014-03-17 15:29:22 +00:00
Hannah Wolfe
6943fa568c Merge pull request #2409 from halfdan/2075-pg-errors
Fixes random pg failures.
2014-03-17 15:20:38 +00:00
John O'Nolan
ad356a9b0a Merge pull request #2403 from halfdan/watch-ghost-ui2
Fix earlier commit for grunt watch.
2014-03-17 15:40:58 +01:00
Fabian Becker
428fb94278 Fixes random pg failures.
fixes #2075
- Updates knex to latest version
- Fixes expected value in page test
- Change fixture insertion to be sequential
- Add orderBy to insertMorePostsTags fixture helper
2014-03-17 10:54:31 +00:00
Hannah Wolfe
dfcd93359d Merge pull request #2430 from mattse/mattse#2409
Fixes race conditions in functional test introduced in PR#2395
2014-03-17 09:43:54 +00:00
mattse
9ae0ddf54c Fixes race conditions in functional test introduced in PR#2395
fixes PR#2395
- in editor_test.js line 272, I wait until the post settings menu appears, and THEN also wait until the delete post button appears, rather than just waiting for the first condition, this can result in a race condition which has been seen.
- in editor_test.js line 229, I click on the tag, then wait until it disappears, rather than asserting the tag doesn't exist immediately.  This could potentially result in a race condition, but I have not seen it yet.
- in editr_test.js line 315, I click on the delete post button, and now wait for the modal container to appear before clicking the accept button.  This could result in a race condition, but I have not seen it yet.
2014-03-17 03:06:22 -04:00
Hannah Wolfe
79a333b480 Merge branch 'master' into ember
Conflicts:
	bower.json
	core/client/views/editor.js
2014-03-16 20:52:44 +00:00
Hannah Wolfe
26cda45d00 Merge pull request #2404 from hswolff/ember-scaffold-ui
Flesh out more of the Ember admin
2014-03-16 20:08:08 +00:00
Harry Wolff
3296a3a41c Flesh out more of the Ember admin
no issue

- this ports over screens from old admin to
 allow people to begin working on aspects of the screen

- All logged out screens have been imported: Signup, Signin,
 Forgotten password, reset password

- Those screens are now ready for behavior to be ported over

- This also updates templates to be more in line with how they were
 in the old admin

- Littered through the code are @TODO comments of functionality that is
 missing and will need to be resolved before this is production ready

- Also scaffolds out the settings screen and every tab
2014-03-16 16:01:56 -04:00
Hannah Wolfe
a65d5bb282 Merge pull request #2407 from JohnONolan/no-bowerrc
Remove .bowerrc
2014-03-16 09:56:55 +00:00
John O'Nolan
deb6da5ed6 Remove .bowerrc
If there are no further comments or suggestions for #2386 then I think it would be good to get this in. Remove .bowerrc from base repo but allows it to still be used for people with specialised dev environments by adding to .gitignore
2014-03-16 09:06:56 +01:00
Fabian Becker
00fd9d9d91 Fix earlier commit for grunt watch.
refs TryGhost/Ghost-UI#18
- Trigger livereload when files in core/client/assets/css/ change
- Copy over new ghost-ui files when changed
2014-03-15 20:36:54 +00:00
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