Commit Graph

2599 Commits

Author SHA1 Message Date
Hannah Wolfe
3ca815cc3d Merge pull request #2772 from shindakun/profilelink
Corrected link to user profile settings
2014-05-17 20:23:07 +01:00
Hannah Wolfe
1c7a6f4a98 Merge pull request #2734 from shindakun/userurl
Validate user URL input to ensure protocol is present
2014-05-17 20:22:32 +01:00
Matt Enlow
992433a131 Added fade-in to ember settings panes
Closes #2749
- Add fade-in class to settings panes headers and contents
2014-05-15 19:59:06 -06:00
Matt Enlow
a29289c448 Add /content redirect to Ember admin.
Closes #2746
- Adds content route to router
- Content route transitions to posts route in the beforeModel hook.
2014-05-15 18:52:10 -06:00
Fabian Becker
f64203cdf7 Correct behaviour for trailing slashes
fixes #2741
- Extend HistoryLocation
- Add trailing slash to path
2014-05-15 22:28:05 +00:00
Jacob Gable
42a1d55858 Improve signin
Ref #2413

- Remove fixture and use actual API
- Store and send down actual logged in user data
- Refactor isLoggedIn to use computed property on application
- After signin, update user data in dependency container
- Add CSRF to all routes and controllers via initializer
- Update authenticated route to check for user.isLoggedIn
- Add notifications for signin error
- Add notifications.showAPIError helper
- Add plumbing for refreshless signup to doSignUp in admin controller
2014-05-15 09:18:43 -05:00
Steve
e0e9bf2046 Validate user URL input to ensure protocol is present
closes #1623
- added protocol validation to isURL on user settings validator.
- added placeholder URL to user profile template
- ref: https://github.com/sethlilly/Vapor/issues/10
- ref: https://github.com/oswaldoacauan/ghostium/issues/38
2014-05-15 06:34:07 -07:00
Steve
f6dd5c1e1d Corrected link to user profile settings
closes #2745
- Added link
2014-05-15 06:27:38 -07:00
Hannah Wolfe
4082b66f08 Merge pull request #2732 from ErisDS/issue-2610
Cleanup & Refactor API option names
2014-05-15 11:07:49 +01:00
Hannah Wolfe
c02ebb0dcf Refactor API arguments
closes #2610, refs #2697

- cleanup API index.js, and add docs
- all API methods take consistent arguments: object & options
- browse, read, destroy take options, edit and add take object and options
- the context is passed as part of options, meaning no more .call
  everywhere
- destroy expects an object, rather than an id all the way down to the model layer
- route params such as :id, :slug, and :key are passed as an option & used
  to perform reads, updates and deletes where possible - settings / themes
  may need work here still
- HTTP posts api can find a post by slug
- Add API utils for checkData
2014-05-15 10:41:05 +01:00
Hannah Wolfe
4378495e8e Merge pull request #2766 from jgable/fixRegister
Fix sign up not setting user on session
2014-05-15 05:44:47 +01:00
Jacob Gable
f565dd505a Fix sign up not setting user on session
No issue found

- Grab user out of api response from users[0]
2014-05-14 20:38:58 -05:00
Hannah Wolfe
f1a3f1a7a5 Merge pull request #2753 from jgable/fixPermissable
Add apps permissable checks in posts and users
2014-05-14 22:10:44 +01:00
Hannah Wolfe
692573a241 Merge pull request #2735 from shindakun/tag404
Display 404 page if tag does not exist.
2014-05-14 16:32:18 +01:00
Hannah Wolfe
4c0010db45 Merge pull request #2673 from halfdan/2592-tags-api
Implements new Themes JSON API
2014-05-14 16:31:36 +01:00
Hannah Wolfe
b631931b2b Merge pull request #2755 from sebgie/fix-validation
Fix validation
2014-05-14 16:29:36 +01:00
Jacob Gable
0dc6dc29a7 Add apps permissable checks in posts and users
Closes #2738

- Re-introduce the TargetModel.permissable interface check in the
regular permission flow path
- Pass loadedPermissions, hasUserPermission and hasAppPermission to
permissable interface to reduce logic necessary
- Refactor recursive call to pass original arguments but with actual
model
- Refactor canThis(this.user) use in api/posts.js to just canThis(this)
2014-05-14 09:22:25 -05:00
Sebastian Gierlinger
d1149a927b Fix validation
- fixed validation that broke when introducing error classes
- added a test
2014-05-14 15:30:46 +02:00
Fabian Becker
628654961a Implements new Themes JSON API
closes #2592
- Add themes browse/read endpoint
- Add new permissions for themes (only admin by default)
- Add integration tests
2014-05-14 11:23:42 +02:00
Hannah Wolfe
cdb98241cf Merge pull request #2715 from javorszky/iss2650
Move mail api to json/api format
2014-05-13 23:27:22 +01:00
Gabor Javorszky
24190a186e Move mail api to json/api format
Fixes #2650
* rerouted all mail sending to api/mail
* changed request and response formats to json/api-like structure
* tested with forgotten password and new blog email
2014-05-13 17:34:37 +01:00
Hannah Wolfe
169a984372 Merge pull request #2737 from jaswilli/issue-2736-pg
Ensure settings values are strings before saving
2014-05-13 14:28:29 +01:00
Hannah Wolfe
89f140c48b Merge pull request #2726 from jaswilli/issue-2720-tags
updateTags refactor
2014-05-13 11:32:16 +01:00
Jason Williams
414890f263 Ensure settings values are strings before saving
closes #2736
-reintroduces JSON.stringify for non-string values in
 api.settings.edit
-added a regression test
2014-05-13 05:36:18 +00:00
Jason Williams
954cb1a59e updateTags refactor
closes #2720
-refactor Models.Posts.updateTags method to reduce complexity
2014-05-12 21:03:26 +00:00
Steve
eb2fdc44fb Display 404 page if tag does not exist.
closes #2667
- if tag result is '' 404 instead of rendering an empty page
- added test for /tag/asdf should 404
2014-05-12 11:30:08 -07:00
Hannah Wolfe
10759ed45a Merge pull request #2733 from jaswilli/test-error
Fix intermittent image upload modal failures
2014-05-12 10:27:15 +01:00
Jason Williams
0d7a935855 Fix intermittent image upload modal failures
ref #1702
-wait for logo upload modal to go away before beginning test
 for cover upload modal
2014-05-12 02:31:20 +00:00
Hannah Wolfe
f1ce28f812 Merge pull request #2730 from jaswilli/test-errors
Another adjustment to handle timing issue on tests
2014-05-11 21:10:17 +01:00
Jason Williams
ef1bc05422 Another adjustment to handle timing issue on tests
ref #1702
-timing issue with the test still exists in #2729 since
 .description is added to the dom after the fact via js
2014-05-11 19:25:48 +00:00
Hannah Wolfe
e4799e3fb0 Merge pull request #2729 from jaswilli/test-errors
Adjust test to handle timing issue on upload modal
2014-05-11 20:06:30 +01:00
Jason Williams
e3c3c2ab30 Adjust test to handle timing issue on upload modal
ref #1702
-change the tests for the cover and logo image upload modal to
 handle a timing issue in the way they are rendered
2014-05-11 18:31:48 +00:00
Hannah Wolfe
31b693da1f Add try-catch to startup
- Should prevent Ghost from exiting without an error message
2014-05-11 17:33:18 +01:00
Hannah Wolfe
25ec0f3f75 Merge pull request #2719 from appleYaks/import-backward-compatible
Make DB Import backwards compatible
2014-05-11 16:17:17 +01:00
Hannah Wolfe
af2326bf67 Merge pull request #2704 from sebgie/issue#2690
Add distinct error classes
2014-05-10 20:28:14 +01:00
Sebastian Gierlinger
fd0f5a5028 Add distinct error classes
closes #2690
- added new error classes
- moved errorhandling.js to /errors/index.js
- changed API errors to use new classes
- updated tests
2014-05-09 12:11:29 +02:00
David Arvelo
eb18991ddb Make DB Import backwards compatible
closes #2716
- Continues to parse and allow import with the old format
- Detects the presence of the new JSON-API format and allows import
2014-05-08 20:29:45 -04:00
Hannah Wolfe
d4a6eb26a4 Merge pull request #2713 from jaswilli/startup-issues
Don't xmlrpc ping for the default Welcome to Ghost post
2014-05-08 12:24:39 +01:00
Hannah Wolfe
896be9119f Cleaning up settings functional tests
ref #1702

- All the tests need cleaning up a bit, but these ones are failing
  regularly and I'd like to get to the bottom of it.
2014-05-08 12:09:32 +01:00
Hannah Wolfe
1c3ba536c9 Merge pull request #2706 from appleYaks/db-api-update
DB API returns JSON-API compatible objects. Export triggers 'Save As' di...
2014-05-08 11:28:02 +01:00
Hannah Wolfe
1f935857e6 Merge pull request #2711 from shindakun/adminnavbar
Fixed admin navbar icons
2014-05-08 11:25:19 +01:00
Hannah Wolfe
33a6ea1edf Merge pull request #2710 from jaswilli/issue-2707
Fix unhandled rejected promises when using admin
2014-05-08 08:01:11 +01:00
Jason Williams
e078cc4085 Don't xmlrpc ping for the default Welcome to Ghost post
closes #2712
-prevents xmlrpc.ping from being run before Ghost is in a valid
state
-fix a call to Object.hasOwnProperty in permissions.hasActionsMap
2014-05-08 03:50:19 +00:00
Steve
820860694c Fixed admin navbar icons
Closes #2708
- Edited classNames to use correct names: settings and editor.
2014-05-07 19:47:35 -07:00
Jason Williams
027169a1d1 Fix unhandled rejected promises when using admin
closes #2707
- adjust call to api.settings.edit now that canThis is in use
2014-05-08 00:10:14 +00:00
David Arvelo
2d783ac3d4 DB API returns JSON-API compatible objects. Export triggers 'Save As' dialog.
closes #2647
- GET method returns { db: [exportedData] }
- POST, DELETE methods return { db: [] }
- 'delete all content' test updated
- Attach 'Content-Disposition' header on DB export for 'Save As' browser dialog
- Add DB API functional test for Export
2014-05-07 19:05:09 -04:00
Hannah Wolfe
bb543ede8e Adding READMEs to clarify the 2 client folders
- seemed like  a good idea.
2014-05-07 22:51:51 +01:00
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
fbbfda3455 Merge pull request #2705 from davidblurton/patch-1
Fix link to wiki page on NPM
2014-05-07 21:25:17 +01:00
Hannah Wolfe
45076db7c6 Merge pull request #2581 from szelpe/ember-debug 2014-05-07 20:55:08 +01:00