Commit Graph

2302 Commits

Author SHA1 Message Date
Hannah Wolfe
2f159cb7df Merge pull request #2435 from halfdan/2148-rpc
Add XML-RPC ping
2014-03-20 19:14:23 +00:00
Hannah Wolfe
8c43f7ed84 Merge pull request #2150 from halfdan/2149-tag-display
Properly display escaped tags in tag editor.
2014-03-20 19:01:47 +00:00
Fabian Becker
9e7469e3ea Add XML-RPC ping
closes #2148
- Added core/server/xmlrpc.js
- Hook into post::saved to ping when a published post gets saved
- Added node package to hook into http requests
2014-03-20 17:53:32 +00:00
Hannah Wolfe
8bca485769 Merge pull request #2384 from ErisDS/showdown-refactor
Improving the showdown extensions
2014-03-20 17:48:06 +00:00
Hannah Wolfe
c02fd70c63 Improving the showdown extensions
fixes #2381

- renamed the ghost extensions
- added new html tests
2014-03-20 17:08:13 +00:00
Hannah Wolfe
3ad4c27968 Merge pull request #2456 from ErisDS/new-showdown-version
Showdown fork now has a version
2014-03-20 17:07:49 +00:00
Hannah Wolfe
762631f590 Showdown fork now has a version
fixes #2454
2014-03-20 16:48:13 +00:00
Fabian Becker
87f4092cd7 Properly display escaped tags in editor.
fixes #2149, fixes #2453
- Escape tag before displaying in editor tag widget
2014-03-20 15:49:08 +01:00
Hannah Wolfe
45361e6a8a Merge pull request #2452 from ErisDS/typography
Removing typography extension
2014-03-20 13:36:10 +00:00
Hannah Wolfe
d8f724d94d Removing typography extension
issue #2312

- The typography extension is still interfering in HTML blocks, reference style links and other bits and pieces it probably shouldn't be :(
- We'll add it back when it's ready.
2014-03-20 13:22:28 +00:00
Hannah Wolfe
39957a7a1d Merge pull request #2451 from ErisDS/showdown-fork
Switch Showdown to fork
2014-03-20 12:08:59 +00:00
Hannah Wolfe
51a7c7c00e Update CONTRIBUTING.md 2014-03-20 11:53:28 +00:00
Hannah Wolfe
1102617768 Update README.md 2014-03-20 11:53:23 +00:00
Hannah Wolfe
6c3c0a5f6c Switch Showdown to fork
fixes #2312

- showdown fork understands more html tags
2014-03-20 11:36:13 +00:00
Jason Williams
b460697a18 Add functional tests for admin navigation bar and menus
issue #2273
- Check that menu nav items exist
- Check that menu nav items are labeled correctly
- Check that menu nav items have correct URLs
2014-03-19 21:33:50 +00:00
Hannah Wolfe
ec3aabb384 Merge pull request #2405 from nicksahler/master
Fixed modal inconsistent fade problem
2014-03-19 16:15:14 +00:00
nicksahler
fbbac37762 Fixes modal fading inconsistency problem by disabling jQuery's
transition and allowing CSS to do its thing

closes #2400
- Removed fadeIn, jQuery's animation
- Added show(), which only manages display, giving transitions to CSS
2014-03-19 08:07:49 -04:00
Hannah Wolfe
4c0d31386d Merge pull request #2438 from ErisDS/cm-mobile
Add shim for codemirror on touchscreens
2014-03-19 09:59:21 +00:00
Hannah Wolfe
5bed81563e Add shim for codemirror on touchscreens
fixes #2385

- stolen the CM shim from js-bin
- if we're on a touchscreen device, don't use CM
- if we're on a touchscreen device, show a coming soon message for uploads
2014-03-19 09:26:45 +00:00
Hannah Wolfe
0221876919 Merge pull request #2437 from ErisDS/cm-scroll
Force preview to scroll to the end
2014-03-19 08:24:45 +00:00
Hannah Wolfe
701a9894b5 Merge pull request #2428 from Decad/master
Fix scoping issue on signup
2014-03-18 22:24:16 +00:00
Sebastian Gierlinger
22bbf57830 Rename getSlug to slug
another 2 % of #2124
- renamed `/ghost/api/v0.1/posts/getSlug/ to
`/ghost/api/v0.1/posts/slug/`
- renamed method getSlug to generateSlug
2014-03-18 14:00:33 +01:00
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