Commit Graph

6367 Commits

Author SHA1 Message Date
Hannah Wolfe
de9976070b deps: chalk@1.1.3 2016-04-26 12:59:32 +01:00
Hannah Wolfe
adaa5c2992 deps: bookshelf@0.9.4 2016-04-26 12:59:32 +01:00
Hannah Wolfe
1745335423 deps: body-parser@1.15.0 2016-04-26 12:59:32 +01:00
Hannah Wolfe
63be9964a2 deps: bluebird@3.3.5 2016-04-26 12:59:32 +01:00
Sebastian Gierlinger
9dd19dd4ff Merge pull request #6745 from ErisDS/express-hbs-update
deps: express-hbs@1.0.0
2016-04-26 13:47:42 +02:00
Kevin Ansfield
9c5eaab37f Use a custom transform to simplify navigation settings
no issue
- moves the `NavItem` object from the navigation controller to an explicit `NavigationItem` model file
- adds a custom transform `navigation-settings` that transforms the navigation settings JSON string to/from an array of `NavigationItem` objects
- simplifies the `settings/navigation` controller as it no longer has to export it's own internal model and handle serialization and deserialization

This pattern should also help simplify the apps/slack integration code if implemented there.
2016-04-26 12:32:29 +01:00
Hannah Wolfe
452664a06e Merge pull request #6756 from kevinansfield/fix-validation-engine-shared-refs
Fix shared references in ValidationEngine
2016-04-26 12:30:51 +01:00
Kevin Ansfield
7a455a3e1d Don't share errors and hasValidated references between validator instances
no issue
- ensure that each validator instance gets it's own `errors` and `hasValidated` objects
- updates some uses of `ValidationEngine` that were relying on side-effects of the unintended reference sharing
- fixes issue with add subscriber modal displaying an error state after opening if it previously had errors when closing
2016-04-25 10:56:11 +01:00
Jason Williams
ef089cc041 Merge pull request #6746 from ErisDS/validator
deps: validator@5.2.0
2016-04-21 09:24:33 -05:00
Hannah Wolfe
e21640a7e5 deps: validator@5.2.0
- also remove from greenkeeper ignores
2016-04-21 12:20:37 +01:00
Hannah Wolfe
31857ed78a deps: express-hbs@1.0.0
refs #2459

This includes updating handlebars to v4 as well as other fixes which
will introduce breaking changes to the theme API:

From express-hbs:
- partials must now use the `.hbs` extension, the same as templates
From handlebars:
- Depthed paths are now conditionally pushed on to the stack.
If the helper uses the same context, then a new stack is not created.
This leads to behavior that better matches expectations for helpers
like if that do not seem to alter the context. Any instances of ../
in templates will need to be checked for the correct behavior under 4.0.0.
In general templates will either reduce the number of ../ instances
or leave them as is. See #1028.
- The = character is now HTML escaped. This closes a potential exploit
case when using unquoted attributes, i.e. <div foo={{bar}}>. In general
it's recommended that attributes always be quoted when their values are
generated from a mustache to avoid any potential exploit surfaces.
2016-04-21 10:45:54 +01:00
Hannah Wolfe
f14c9f488f Merge pull request #6645 from joerx/issue6462
deps: validator@5.1.0
2016-04-20 18:55:43 +01:00
Kevin Ansfield
c98872586c Merge pull request #6742 from acburdine/client-deps
Update some client dependencies
2016-04-20 13:09:26 +01:00
Austin Burdine
e8e249691c lock jquery-deparam version 2016-04-20 06:18:47 -05:00
Austin Burdine
c6ef618e10 deps: password-generator@2.0.2 2016-04-20 06:17:44 -05:00
Kevin Ansfield
f8f4d3521c Merge pull request #6741 from acburdine/drop-jquery
Allow Ember to specify jQuery version
2016-04-20 09:28:02 +01:00
Austin Burdine
95030734e9 allow ember to specify jQuery version
- fix slight acceptance test bug
2016-04-19 14:08:36 -05:00
Kevin Ansfield
7fb441e640 Merge pull request #6492 from acburdine/ember-power-select
Convert gh-search-input to ember-power-select component
2016-04-19 17:40:27 +01:00
Austin Burdine
96c855136c replace gh-selectize with power-select in gh-search-input
refs #6458
2016-04-19 10:55:10 -05:00
Austin Burdine
8221f86fac deps: ember-power-select@0.9.2 2016-04-19 10:25:58 -05:00
Austin Burdine
6c5a4ed93d Merge pull request #6735 from kevinansfield/improve-pagination-mixin
Improve `PaginationRoute` mixin
2016-04-19 10:20:08 -05:00
Austin Burdine
a9f41c96a7 Merge pull request #6734 from kevinansfield/deps-ember-one-way-controls
deps: ember-one-way-controls@0.6.2
2016-04-19 08:35:47 -05:00
Hannah Wolfe
94a4e08809 Add config URLS to CORS whitelist
refs #6644

- urls specified in config.js should be considered whitelisted/trusted
- this is not quite straightforward because config.js is not ready at the point the middleware is required
- tests have been updated to cover these new cases + use rewire to override the internal whitelist cache
2016-04-19 13:39:24 +01:00
Kevin Ansfield
459f2c4355 Improve PaginationRoute mixin
no issue
- returns the promise/result from `loadNextPage` so that it's return value can be utilised in closure actions
- sets the `isLoading` property in `loadFirstPage` to match `loadNextPage` behaviour
- reset the `isLoading` property even if the request fails
- adds a `didReceivePaginationMeta` hook so that consumers of the mixin can use the metadata values without having to rely on observers
  - eg. pulling the `total` into a separate property that can be manipulated when items are added/removed but still reset to the sever's total value the next time a page is loaded
- renames the `pagination-route` mixin to simply `pagination` as it's not tied to routes and works equally well in other objects that need to paginate an API resource
2016-04-19 10:53:45 +01:00
Kevin Ansfield
5eb120cc8b deps: ember-one-way-controls@0.6.2
no issue
- https://github.com/DockYard/ember-one-way-controls/compare/v0.5.4...v0.6.2
- bugfixes
- dynamic attribute binding (attributes no longer need to be explicitly defined in the components in order to be recognised)
- adds `one-way-radio` component
2016-04-19 10:22:29 +01:00
Hannah Wolfe
164dda9af7 Merge pull request #6738 from jaswilli/update-contribs
deps: top-gh-contribs@2.0.3
2016-04-19 09:41:40 +01:00
Jason Williams
b4adc322f8 deps: top-gh-contribs@2.0.3 2016-04-18 22:50:48 -05:00
Joerg Henning
0f3cb44227 deps: validator@5.1.0
closes #6462

- monkey-patch validator.extends() since it was dropped by validator @5.0.0
- coerce input to string prior to validation (custom toString func)
- need to handle boolean validation based on column type not isIn()
- use `lodash.tostring` to convert input values to strings
2016-04-19 09:39:12 +08:00
Hannah Wolfe
b450fba5e3 Merge pull request #6722 from kirrg001/6413/post-scheduling-events
add events for post scheduling (scheduled, unscheduled, rescheduled)
2016-04-18 19:56:29 +01:00
Kevin Ansfield
7cb03f8c91 Merge pull request #6732 from acburdine/ember-cli-update
Ember-CLI 2.5 update
2016-04-18 17:06:28 +01:00
Katharina Irrgang
d24466a284 add events for post scheduling
refs #6413
- accept scheduled status
- add a lot of tests for all kinds of edge cases
- compare dates without ms because mysql does not store ms
2016-04-18 16:44:41 +02:00
Austin Burdine
3461ef96ed deps: ember-cli@2.5.0 2016-04-17 20:05:42 -05:00
Sebastian Gierlinger
817a302885 Merge pull request #6628 from ErisDS/migration-005
Data & Fixture Migrations v005
2016-04-15 15:51:52 +02:00
Kevin Ansfield
63dd3e2cb9 Merge pull request #6729 from acburdine/ember-2.5
Ember Dependency Updates
2016-04-15 08:56:56 +01:00
Austin Burdine
e12e976c58 deps: ember-data@2.5.2 2016-04-15 00:32:57 -05:00
Austin Burdine
71474c4422 deps: ember@2.5.0 2016-04-15 00:24:57 -05:00
Sebastian Gierlinger
10abe3e100 Merge pull request #6724 from ErisDS/internal-apps
Minor internal apps improvements
2016-04-14 22:51:10 +02:00
Hannah Wolfe
999f7d43e2 Merge pull request #6714 from kevinansfield/allow-mocked-endpoints-in-dev
Enable ability to mock endpoints in development mode
2016-04-14 19:12:43 +01:00
Hannah Wolfe
c5eda57f1e Minor internal apps improvements
refs #6589

- add internalAppsPath as a proper config path
- middleware/routes will be setup for any internal apps which have the function
- this should be refactored into some sort of proper hooks system as part of apps
- internal apps get permission to do anything the proxy allows
2016-04-14 19:05:48 +01:00
Hannah Wolfe
5884fe0323 Add permissions models & relations for clients
refs #6301, #4176

Add migration for:
- 5 new client permissions
- 15 relations between the admin, editor & author role and the 5 new permissions
- updates to tests to show that permissions get updated properly
2016-04-14 19:02:56 +01:00
Hannah Wolfe
8b9734ea31 Add new ghost-scheduler client
refs #6301, #6399

- new scheduler client will be used by any web app that handles time and calls back to the scheduling API at the right time
- new scheduler client will need to be confidential, rather than public, hence the 'web' type instead of 'ua'
- adds validation to client type that it must have a type of 'ua', 'web', or 'native'
2016-04-14 19:02:49 +01:00
Hannah Wolfe
739977a368 Add social media columns to users
refs #6301, #6534

- adds facebook and twitter columns, which should contain urls
2016-04-14 18:59:15 +01:00
Hannah Wolfe
2685970d96 Add mobiledoc column to posts
refs #6301, #6255

- new, extra-long, column for storing mobiledoc content format
2016-04-14 18:59:15 +01:00
Hannah Wolfe
e7cc18d5fb Add visibility column to posts, tags and users
refs #6301, #6165

- visibility is added as a new column on posts, tags and users.
- has a relevant default value for each table
2016-04-14 18:59:14 +01:00
Hannah Wolfe
b4ae469c12 Drop hidden column from tags table
refs #6301

- column is not used and we'll be adding a visibility column to serve the intended purpose
2016-04-14 18:59:14 +01:00
Hannah Wolfe
f08fe28834 Move fixClientSecret to 005 fixture migration
refs  #6301

- move the temporary `fixClientSecret` function from migration.init into being a proper fixture migration task
- update the tests accordingly
2016-04-14 18:59:14 +01:00
Hannah Wolfe
fa8555bda2 Initial commit of 005 version
refs #6301

- bump the default version & update corresponding test
- add empty task folders for 005 data & fixture migrations
- update tests to cover the new 005 upgrades
2016-04-14 18:59:13 +01:00
Hannah Wolfe
31ebc7f3dd Merge pull request #6685 from kirrg001/fix/setup-for-some-single-tests
fix: update_check_spec setup, serve-shared-file_spec setup
2016-04-14 18:51:24 +01:00
Katharina Irrgang
54347e2a31 fix: update_check_spec setup, serve-shared-file_spec setup
revert whitespace changes
2016-04-14 18:24:53 +02:00
Hannah Wolfe
c53e45fc8a Merge pull request #6651 from kevinansfield/uploader-js-must-die
Replace jQuery-based uploader.js with ember components
2016-04-14 16:57:57 +01:00