0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Commit graph

2262 commits

Author SHA1 Message Date
Hannah Wolfe
fd8837511f Merge pull request #2472 from halfdan/ember-notifications-2417
[Ember.js] Implement Notifications for Ember
2014-04-16 20:03:00 +01:00
Hannah Wolfe
9c1fe62173 Merge branch 'apps-perms' into master 2014-04-16 19:27:10 +01:00
Sebastian Gierlinger
664b002f43 missing semicolon + console.log 2014-04-16 18:49:07 +02:00
Sebastian Gierlinger
da3630071a Added and fixed permission tests
- fixed test for db functions
- added tests for different users
2014-04-16 18:22:22 +02:00
Sebastian Gierlinger
e47e9c62d0 Add permissions to API
closes #2264
- added permissions check to db, users and posts
- added register method to users
- added doesUserExist method to users
- added user from session to internal calls
- changed permissible to overwrite canThis
- removed action map and action type from permissable method
2014-04-16 18:22:22 +02:00
Sebastian Gierlinger
61e94a6e8b Use current user in models
closes #2058
- fixed apiContext as suggested in the issue
- added user to options object for models
- added api.users.register() for public registration
- changed models to use options.user for created_by, updated_by,
author_id and published_by
- added override to session model to avoid created_by and updated_by
values
- added user (id: 1) to tests
- added user (id: 1) for registration
- added user (id: 1) for import, fixtures and default settings
- added user (id: 1) for user update
- added user (id: 1) for settings update (dbHash, installedApps, update
check)
- updated bookshelf to version 0.6.8
2014-04-16 18:20:09 +02:00
Jacob Gable
88d82ff441 canThis() improvements
- Handle passing undefined user to canThis
  - Add existence check to parseContext if statement
  - Add unit test that passes undefined to canThis
- Allow internal canThis() checks
  - Allow passing 'internal' or { internal: true } as context
  - Do not lookup user permissions unless context.user found
  - If context.internal, resolve immediately
  - Add unit tests for passing 'internal' and { internal: true }
2014-04-16 18:17:43 +02:00
Fabian Becker
b8e8f63e44 Adds additional fields to apps schema.
fixes #2356
- Adds slug, version and status fields to apps schema
- Added fields to data generator
2014-04-16 18:16:10 +02:00
Sebastian Gierlinger
c0dc8e95d2 Add new permissions to fixtures
closes #2325
- added new permissions
- added relation to user roles
- added updateFixtures to migrateUp
- removed validation per model to fix tests
2014-04-16 18:16:10 +02:00
Jacob Gable
13d2d04c72 App Permissions from package.json
Progress on #2095

- Add new AppPermissions class with read() method
- has default permissions to read and browse posts
- uses default permissions if no package.json
- uses default permissions if no ghost object in package.json
- errors when reading malformed package.json
- uses ghost.permissions if found in package.json
2014-04-16 18:14:56 +02:00
Fabian Becker
41cef386bc Implements Models & Data API for Apps
closes #2138
- Adds new models for AppField and AppSetting
- Removed permitted attributes from App model (handled by base)
- Added reference from Post to AppFields
- Added fixture data to DataGenerator
- Added integration tests for Apps, AppSettings, AppFields
- Added import for Apps
- Added app_fields to default fixtures
2014-04-16 18:14:56 +02:00
Fabian Becker
7b003beb17 Schema additions for apps.
fixes #2102
- Added app_settings, app_fields, app_fields_relations tables
2014-04-16 18:06:39 +02:00
Jacob Gable
9369dd3bf7 Add app permission checking to canThis
- Pass permissions loading to buildObjectTypeHandlers to eliminate
shared state
- Load both app and user permissions to check
- Check app permissions if present
- Create apps table and App model
- Move effectiveUserPermissions to permissions/effective
- Change permissable interface to take context; user and app.
- Add unit tests for app canThis checks and effective permissions
2014-04-16 18:06:39 +02:00
Hannah Wolfe
9447b4ec2a Merge pull request #2560 from halfdan/filter-context
Implement filter context
2014-04-16 11:39:06 +01:00
Hannah Wolfe
44ae3d28ac Merge pull request #2595 from ErisDS/issue-2594
Add warning message about master branch to grunt prod
2014-04-16 11:37:09 +01:00
Hannah Wolfe
b89727a573 Merge pull request #2596 from sebgie/issue#2580-move-obj
Move post API to primary document format
2014-04-16 11:36:56 +01:00
Hannah Wolfe
e10c13aed3 Add warning message about master branch to grunt prod
closes #2594
2014-04-16 11:17:00 +01:00
Sebastian Gierlinger
9321289c1d Move post API to primary document format
closes #2580
- added new format to post API methods
- added post object parsing and wrapping to admin
- removed unused ‚user‘ object from API response
- updated tests
2014-04-16 12:09:03 +02:00
Hannah Wolfe
a4eade9ea4 Merge pull request #2590 from jaswilli/ember-userprofile
Set user profile website field to type url
2014-04-14 20:57:29 +01:00
Hannah Wolfe
381b03ab96 Merge pull request #2589 from jaswilli/userprofile
Set input field types to match expected input values
2014-04-14 20:56:50 +01:00
Jason Williams
77b14dc338 Set user profile website field to type url
closes #2588
2014-04-14 16:22:14 +00:00
Jason Williams
d3237488ca Set input field types to match expected input values
ref #2588
- Change name field in User Profile to be type text
- Change website field in User Profile to be type url
2014-04-14 16:18:17 +00:00
Hannah Wolfe
0806c3188e Merge pull request #2586 from jaswilli/issue-2273
Added functional tests for admin content screen
2014-04-13 16:09:10 +01:00
Jason Williams
7f8bc50ea8 Added functional tests for admin content screen
issue #2273
- test draft/page/published label
- test green add new post button
- test status and author in preview header
- test edit post button
- test delete modal
2014-04-12 20:56:53 +00:00
Hannah Wolfe
9560b6a526 Merge pull request #2578 from schneidmaster/fix-1702
Ensure libraries are present when running phantom.js test
2014-04-11 10:14:29 +01:00
Zach Schneider
58bc5cba63 Fix issues with bower assets in tests
- Ensure that there are no spaces in path so `bower install` succeeds
- Ensure that shell:bower is executed before tests are run

Fixes #1702
2014-04-10 16:45:28 -04:00
Peter Szel
2433116cc6 Added email sending endpoint to the API.
closes #2550

- Added new API module named 'mail'
- Added routes for the mail endpoint
- Added 'send a test email' button to the debug settigns page
- Added handler to this button which sends and AJAX request to the mail API endpoint
2014-04-09 23:56:21 +02:00
Hannah Wolfe
37d13d3fbc Merge pull request #2574 from LazyChild/issue-2573
OSX shortcut fix.
2014-04-09 15:25:53 +01:00
Renyu Liu
0fbe42d593 OSX shortcut fix.
closes #2573
- separate different shortcuts by OS detection in markdownEditor.js
2014-04-09 09:31:38 +08:00
Fabian Becker
a4f8088697 Implement Notifications for Ember
closes #2417
- Adds Notification(s)Component
- Render notifications in application.hbs
- Adds handleError in application route
2014-04-09 00:36:15 +00:00
Hannah Wolfe
a896712f4e Merge pull request #2526 from szelpe/ember-fadein2
Added fancy fade-in effect to the login pages
2014-04-08 13:49:45 +01:00
Peter Szel
39ae3869a1 Added fancy fade-in effect and autofocus to the login pages (signin, signup, forgotten, reset).
- Added CSS to implement the fade in effect.
- Added 'autofocus' to the attribute bindings of the TextField so they accept it.
2014-04-08 00:02:54 +02:00
Hannah Wolfe
c746a88b2e Merge branch 'master' into ember
Conflicts:
	Gruntfile.js
	core/client/assets/lib/showdown/extensions/ghostdown.js
	core/client/views/editor.js
	core/clientold/assets/lib/showdown/extensions/ghostdown.js
	core/shared/lib/showdown/extensions/ghostimagepreview.js
	core/test/unit/showdown_client_integrated_spec.js
	core/test/unit/showdown_ghostimagepreview_spec.js
2014-04-07 22:26:53 +01:00
Hannah Wolfe
f47af4661d Merge pull request #2512 from surgesoft/issue-2443 2014-04-07 15:59:37 +01:00
Hannah Wolfe
609be5eb26 Removing test-api from Gruntfile.js
closes #2443
2014-04-07 15:53:13 +01:00
surgesoft
e89e38dd4b Refactor the API route tests to use supertest
close #2443
- Refactor API tests from `/core/test/functional/api` to
  `/core/test/functional/routes/api`, using supertest instead of request
- Remove `core/test/functional/api` folder
2014-04-07 15:40:20 +01:00
Hannah Wolfe
0bf2a5ada0 Merge pull request #2566 from jaswilli/fix/issue-2563
Build correct path on image upload when config has custom content path
2014-04-07 15:31:28 +01:00
Hannah Wolfe
694c787ea3 Merge pull request #2552 from hschaeidt/master
in some cases the git protocol cannot be processed
2014-04-07 15:10:35 +01:00
John O'Nolan
639303e763 Merge pull request #2561 from t3chnoboy/master
Use SVG version of travis build status badge
2014-04-07 15:27:04 +02:00
Hannah Wolfe
bf44380dd7 Merge pull request #2564 from hswolff/ember-upgrade
Update Ember to 1.5.0 and Ember resolver and handlebars to 1.3.0
2014-04-07 14:19:40 +01:00
Jason Williams
e3056990cd Build correct path on image upload when config has custom content path
closes #2563
- build path relative to imagesPath (which contains the custom content path)
  instead of appRoot
- added test for custom content path
- added logic to tests for Windows url building to handle cases where Windows
  functionality is being tested on a unix operating system
2014-04-07 05:01:39 +00:00
Hannah Wolfe
68fe40442b Merge pull request #2545 from joeljfischer/minify-jquery
[WIP] Ghost footer outputs minified jquery
2014-04-06 23:15:48 +01:00
Hannah Wolfe
50c7d3597a Merge pull request #2532 from szelpe/ember-reset-2412
Created ResetController.
2014-04-06 23:08:48 +01:00
Hannah Wolfe
d4389c580d Merge pull request #2546 from hswolff/ember-modals
Creates Ember Modal infastructure
2014-04-06 22:36:47 +01:00
Harry Wolff
5be07d17b2 Update Ember to 1.5.0 and Ember resolver and handlebars to 1.3.0
no related issue
2014-04-06 15:57:49 -04:00
Hannah Wolfe
605d59304c Merge pull request #2558 from sebgie/build-fix
Remove second PUT request on image save
2014-04-06 20:43:12 +01:00
Hannah Wolfe
9e358fb922 Merge pull request #2517 from novaugust/theme_error
Fixed check for a theme's custom error.hbs
2014-04-06 19:22:29 +01:00
Harry Wolff
fa9bddb208 Creates Ember Modal infastructure
resolves #2416

This is a pretty large commit but what it's adding are pretty fundamental to the admin app.

- Creates top level actions on the ApplicationRoute for opening and closing modals.  This allows sending the 'openModal' action from any template to open a modal.

- Every modal template lives in 'templates/modals/{{modalName}}'

- Each modal can have a backing controller of the same name that can provide additional control for that modal.  Those controllers reside in 'controllers/modals/{{modalName}}'

- Created the ModalDialog component which is where all the logic for the component resides.  It's not at 100% parity with the existing Ghost modal system but it has the foundation for further fleshing out.  It currently accepts parameters for styling how the modal should appear, which previously was defined in JS files in the Backbone admin.

- This creates the 'delete all posts', 'delete this post', 'markdown', and 'upload' modal.  Some are in more stages of completion than others, but I wanted to just get the foundation in place as fast as possible.

- This also creates the UploadModal component which is a subclass of the ModalDialog component.  The reason for this subclassing is that the UploadModal component directly accesses the DOM and when that occurs in Ember it should remain in a component definition.  It's ready for extending to reach parity.  Note: depending on needs the base ModalDialog class may need to be modified.
2014-04-06 12:45:19 -04:00
Dmitry Mazuro
9aa25ad723 Use SVG version of travis build status badge 2014-04-06 19:45:13 +03:00
Sebastian Gierlinger
9ceb4a6ab4 Remove second PUT request on image save
closes #2557
- replaced model.save() with model.set()
2014-04-06 17:46:04 +02:00