TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-15 19:52:01 +03:00
Code Issues Projects Releases Wiki Activity
2,827 Commits 253 Branches 1,686 Tags 364 MiB
88743d03c4
Commit Graph

2827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannah Wolfe
88743d03c4 Merge pull request #3340 from sebgie/issue#3339 
Fix file validation for importer
 2014-07-21 16:00:30 +01:00
Hannah Wolfe
4c276603ec Fix tests tripping spam protection 2014-07-21 14:33:42 +01:00
Hannah Wolfe
44cfcb6b01 Caching db config in migration utils 2014-07-21 13:25:53 +01:00
Hannah Wolfe
cf9839c71d Integration tests use consistent teardown methods 2014-07-21 13:25:51 +01:00
Sebastian Gierlinger
772d81849e Fix file validation for importer 
refs #3339
- wrong call to file validation
- refs the issue because I get application/json on OSX? Is this
something Windows specific?
 2014-07-20 23:07:17 +02:00
Hannah Wolfe
c2f0fd54da Merge pull request #3326 from ErisDS/issue-3309 
Adding helper for invite status
 2014-07-20 19:11:05 +01:00
Hannah Wolfe
2b28e252d7 Merge pull request #3336 from javorszky/fix-catches-in-tests 
Replaces then(null, done) with .catch(done), OCD on blank lines
 2014-07-20 18:03:28 +01:00
Hannah Wolfe
4fb3b53653 Merge pull request #3334 from JohnONolan/BIGGER 
Larger default gravatar images
 2014-07-20 18:03:23 +01:00
John O'Nolan
d10771b711 Larger default gravatar images 2014-07-20 18:50:07 +02:00
Hannah Wolfe
d8818a12d9 Merge pull request #3335 from ErisDS/issue-3333 
switched parent_id for parent
 2014-07-20 17:46:26 +01:00
Gabor Javorszky
36ba3549e7 Replaces then(null, done) with .catch(done), OCD on blank lines 
No issue
 2014-07-20 17:32:29 +01:00
Hannah Wolfe
9575b25711 switched parent_id for parent 
fixes #3333
 2014-07-20 16:39:56 +01:00
Hannah Wolfe
e42739fe97 Merge pull request #3332 from javorszky/add-integration-test-example 
Added example to run a specific integration test to gruntfile
 2014-07-20 15:15:26 +01:00
Gabor Javorszky
aca0c7daf6 Added example to run a specific integration test to gruntfile 
No issue
 2014-07-20 15:11:02 +01:00
Hannah Wolfe
27f980bd42 Removing console.log 2014-07-20 13:35:39 +01:00
Hannah Wolfe
d2ebe49f9a Upgrading Casper 2014-07-20 09:35:18 +01:00
Hannah Wolfe
5a6af020c5 Model & test cleanup 2014-07-20 09:34:30 +01:00
Hannah Wolfe
ab90c40e4e Adding helper for invite status 
closes #3309, refs #3229

- adds different message depending on status
- doesn't delete the new user if the problem was an email error
- filters the 2 lists based on all statuses
 2014-07-20 09:23:57 +01:00
Hannah Wolfe
94fca08500 Merge pull request #3327 from ErisDS/issue-3284 
Export 003
 2014-07-19 23:28:32 +01:00
Hannah Wolfe
82742fc233 Export 003 
closes #3284

- ensure token tables aren't exported
- cleanup filename
- failed export throws internal server error
 2014-07-19 22:38:21 +01:00
Hannah Wolfe
cf4dd8eaa5 Merge pull request #3324 from novaugust/psm-authors 
Add Author dropdown to PostSettingsMenu
 2014-07-19 01:43:43 +01:00
Hannah Wolfe
43b91f281d Merge pull request #3322 from jaswilli/check-setup 
Check setup status when making API responses
 2014-07-19 00:36:12 +01:00
Matt Enlow
ad3ff49bea Add Author dropdown to PostSettingsMenu 
Ref #3084
This PR does NOT hide the dropdown as required to close 3084.

- `EditorNewRoute` creates post with the author set to the current user
- added `authors` ArrayPromiseProxy (whoa, what?) to PSM
- added `changeAuthor` function that sets author and saves model when the user selects a new author
 2014-07-18 17:29:46 -06:00
Hannah Wolfe
c9b24b0a9b Merge pull request #3321 from ErisDS/issue-2600-fin 
Wrap up schema amends for 003
 2014-07-19 00:19:14 +01:00
Hannah Wolfe
2498098095 Merge pull request #3320 from jaswilli/dup-slug-get 
Prevent duplicate slug request on saving new post
 2014-07-19 00:14:15 +01:00
Hannah Wolfe
67de186893 Merge pull request #3319 from ErisDS/issue-3275 
Extending context concept to models
 2014-07-19 00:13:19 +01:00
Hannah Wolfe
fdff51cb6c Merge pull request #3314 from jaswilli/issue-3160 
Add a notify action to the notifications component
 2014-07-19 00:11:10 +01:00
Jason Williams
7d3139d093 Check setup status when making API responses 
Closes #3303, Closes #3299
- Check whether or not setup has been completed when deciding
  how to respond to certain API requests.
- Add tests.
 2014-07-18 22:28:28 +00:00
Hannah Wolfe
8fc1b03ea7 Wrap up schema amends for 003 
closes #2600

- adds 2 new columns to tags, for the soon-to-land tag management UI
- fixes validation for the active bool in app_fields
- adds missing return to addColumn command
- cleanup in addTableColumn util
 2014-07-18 19:33:36 +01:00
Hannah Wolfe
f8a924731a Merge pull request #3318 from halfdan/apps-schema 
Schema changes for Apps
 2014-07-18 16:39:45 +01:00
Hannah Wolfe
214ef16fae Merge pull request #3297 from jaswilli/issue-3271 
Turn off autocomplete for user profile form
 2014-07-18 16:07:03 +01:00
Jason Williams
a18e5ce9ed Prevent duplicate slug request on saving new post 
No Issue
- Do not run generateSlugPlaceholder if save has been initiated
  and the title has already been set on the post. At that stage
  a slug has already been generated and another API call is not
  necessary.
 2014-07-18 15:05:10 +00:00
Hannah Wolfe
6e48275160 Extending context concept to models 
fixes #3275, fixes #3290, ref #3086, ref #3084

- Ensure that we use the current logged in user and not just user 1 when
- removing hard coded user: 1 except where absolutely necessary
- passing context, rather than user to models
- base model has a new function to determine what id to use for created_by etc
 2014-07-18 15:32:56 +01:00
Fabian Becker
5cd5f8cca9 Schema changes for Apps 
refs #2465
- Add active field to app_fields
- Adjust data generator for app fields
 2014-07-18 12:39:14 +00:00
Hannah Wolfe
d386f66f1e Merge pull request #3317 from sebgie/fix-edit-posts 
Fix editing author
 2014-07-18 11:15:41 +01:00
Sebastian Gierlinger
62c1ce128e Fix editing author 
no issue
- author_id is converted to author for API responses but was never
converted back for requests
 2014-07-18 10:48:48 +02:00
Hannah Wolfe
14f72b5e14 Merge pull request #3316 from PaulAdamDavis/invited-users-class 
Add class to invited users container
 2014-07-18 09:45:04 +01:00
Paul Adam Davis
7b626baf3f Add class to invited users container 
No issue

- Relates to 447c7d77ec (diff-acda43902fe5a16fa255b16e7b32e6d0R14)
- Adds class to the invited users container, used only for spacing right now
 2014-07-18 09:02:35 +01:00
Jason Williams
b7be74907f Add a notify action to the notifications component 
Refs #3160
- gh-notifications component now takes an optional notify
  parameter.  If present it will be invoked as an action
  when a notification is added or removed.
- Add a data-notification-count attribute to the main container
  that tracks the number of "top" notification messages that
  are currently being shown.
 2014-07-17 17:34:38 +00:00
Hannah Wolfe
48cbf371a2 Merge pull request #3313 from ErisDS/improve-fixtures 
FORCE_MIGRATION ensures fixtures are added
 2014-07-17 18:21:44 +01:00
Jason Williams
ec1f4d0297 Turn off autocomplete for user profile form 
Closes #3271
 2014-07-17 17:09:20 +00:00
Hannah Wolfe
487844122d Merge pull request #3312 from ErisDS/issue-2739-2 
Wire permmissions for notifications, mail and tags
 2014-07-17 18:04:38 +01:00
Hannah Wolfe
65230cf1b8 Merge pull request #3302 from jgable/fixUserMe 
Fetch actual user in settings/users/user
 2014-07-17 18:01:55 +01:00
Jacob Gable
d874e79dbd Fetch actual user on settings/users/user 
Closes #3279

- Switch from this.session.get('user') to this.store.find('user') and
some further limiting until a custom user adapter is created
- Switch the deactivate logic to rollback the used model
- Pass the user as the model in the link-to in user list template
 2014-07-17 10:44:39 -05:00
Hannah Wolfe
cfaa6f058a Wire permmissions for notifications, mail and tags 
closes #2739

- wraps the api endpoints for mail, notifications, and tags in a canThis
  check
- add internal context to internal calls
- updates tests
 2014-07-17 16:44:09 +01:00
Hannah Wolfe
efa7665124 Merge pull request #3310 from sebgie/issue#3128-2 
Fix tests failing because of spam protection
 2014-07-17 16:41:31 +01:00
Hannah Wolfe
b46aa2b576 FORCE_MIGRATION ensures fixtures are added 
refs #2600, refs #3296
 2014-07-17 13:54:03 +01:00
Hannah Wolfe
6ab8a37f79 Merge pull request #3300 from ErisDS/issue-2739 
Adding and renaming permissions
 2014-07-17 13:25:47 +01:00
Hannah Wolfe
c28167c971 Merge pull request #3304 from JohnONolan/noplaceholder 
Removing erroneous placeholder text from user profile
 2014-07-17 13:23:04 +01:00
Sebastian Gierlinger
ab456638c1 Fix tests failing because of spam protection 
closes #3128 (now really)
- added express variable disableLoginLimiter
- added disableLoginLimiter to all tests that use Ghost as module and
do authentication
- fixed isSetup not working for status other than active
- removed ‚Ensure a User is Registered‘ test as this is covered by the
new setup test
 2014-07-17 14:22:32 +02:00