TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-07 11:30:55 +03:00
Code Issues Projects Releases Wiki Activity
5,824 Commits 252 Branches 1,686 Tags 339 MiB
d710bdea1a
Commit Graph

5824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Gierlinger
2b926f55a1 Merge pull request #6185 from ErisDS/unidecode 
deps: unidecode@0.1.8
 2015-12-08 12:25:11 +01:00
Hannah Wolfe
494245ff20 deps: unidecode@0.1.8 
closes #6163
 2015-12-08 11:01:58 +00:00
Kevin Ansfield
b858232369 Fix changing text and jumping caret in PSM's date input 
refs #5777
- adds new `gh-datetime-input` that takes a one-way-bound value and formats it, only triggering the supplied `update` action on focus-out
- fixes bug in PSM's `setPublishedAt` action if model's `published_at` is a Date object not a Moment object
 2015-12-08 10:13:17 +00:00
Sebastian Gierlinger
4524898cfc Merge pull request #6182 from ErisDS/channel-config-dynamic 
Make channel config dynamic
 2015-12-07 22:25:37 +01:00
Hannah Wolfe
a956d595f2 Make channel config dynamic 
refs #5091, #6166

- fetch channel config via an internal function
- prevents channel config from being statically cached at runtime
- means that labs & other settings can be used to change these values
 2015-12-07 20:06:35 +00:00
Kevin Ansfield
d989933b5c Prevent 404-handler mixin from erroring on non-adapter errors 
no issue
- add a check for existence of `error.errors` as that won't be present on non-404 errors - fixes non-404 errors such as "no action handled x" being hidden by a completely different error
 2015-12-07 18:37:35 +00:00
Kevin Ansfield
adfad93242 Merge pull request #6178 from syaiful6/select-native 
Fix Select Component
 2015-12-07 10:40:40 +00:00
Syaiful Bahri
b5a8ac3a7d Fix Select Component 
jQuery instance isn't iterable, so we cant destructuring it.

closes https://github.com/TryGhost/Ghost/issues/6171
 2015-12-07 16:44:54 +07:00
Kevin Ansfield
a9c952d134 Merge pull request #6100 from acburdine/all-the-tests 
Team Acceptance Test
 2015-12-07 09:03:46 +00:00
Austin Burdine
c8ac5f37e8 add team acceptance test 2015-12-06 15:24:06 -06:00
Hannah Wolfe
22e3c54ed1 Merge pull request #6174 from cruikshj/master 
fixing 'undefined is not a function' error when loading apps
 2015-12-06 09:34:53 +00:00
Sebastian Gierlinger
1858bbd55e Merge pull request #6173 from ErisDS/gruntfilefix 
Streamline when grunt init is called in tests
 2015-12-05 11:30:24 +01:00
John Cruikshank
5e6ed119fa fixing 'undefined is not a function' error when loading apps 2015-12-04 23:00:37 -06:00
Hannah Wolfe
739c7d36ed Streamline when grunt init is called in tests 
- test-server only needs submodules to be updated
 2015-12-04 19:53:50 +00:00
Hannah Wolfe
ef53b1bf00 Merge pull request #6161 from kevinansfield/jscs-deps 
deps: jscs@2.6.0 & ember-suave@1.2.3
 2015-12-04 10:33:19 +00:00
Kevin Ansfield
cc1fbd44cb Merge pull request #6098 from acburdine/tag-404 
Fix 404 error handling in editor, tags, and team routes
 2015-12-04 10:20:22 +00:00
Kevin Ansfield
dbf6b59866 deps: grunt-jscs@2.4.0 2015-12-04 10:12:16 +00:00
Kevin Ansfield
4a32098b64 Install client dependencies when running TEST_SUITE=lint build 
refs #6161
- run the client initialization tasks as part of the `TEST_SUITE=lint` to fix problems with missing `ember-suave` jscs preset
 2015-12-04 09:58:03 +00:00
Kevin Ansfield
d9d8446f02 deps: jscs@2.6.0 & ember-suave@1.2.3 
no issue
- fixes an error that popped up after ember-suave's `brocolli-jscs` dependency moved to `2.6.0` which duplicated some of the rules that `ember-suave` used to implement
 2015-12-04 09:58:03 +00:00
Austin Burdine
9f827204df fix 404 error handling in editor, tags, and team routes 
closes #6094
- adds 404-handler mixin
- applies mixin to settings/tags/tag, editor/edit and team/user routes
- adds adapter-error test helper to override the default adapter error
 2015-12-03 16:37:23 -06:00
Sebastian Gierlinger
67c93cb90d Merge pull request #6168 from ErisDS/labs-sync 
Change server-side labs utility to be synchronous
 2015-12-03 21:25:53 +01:00
Hannah Wolfe
4bfacf6b86 Change server-side labs utility to be synchronous 
refs #6165

- Use the settings cache to populate config.labs whenever settings change
- Use the labs util just to check if a flag isSet synchronously
 2015-12-03 16:05:50 +00:00
Hannah Wolfe
ea8533842d Merge pull request #6122 from kevinansfield/slug-query-with-include 
Add count.posts support to user model on client
 2015-12-03 14:48:21 +00:00
Gary Cao
75845ce4af Checkbox labels are cut off on mobile. 
closes #6089
 2015-12-02 18:28:50 +09:00
Sebastian Gierlinger
bc83dbce09 Merge pull request #6145 from ErisDS/view-refactor 
Unify code for picking a template to render with
 2015-12-02 10:02:31 +01:00
Sebastian Gierlinger
e5e5b1138a Merge pull request #6159 from bhops/cleanup 
Remove undefined function in middleware
 2015-12-02 10:00:31 +01:00
Brandon Hops
e5ee97bece Remove undefined function and fix some comments 2015-12-01 23:28:36 -08:00
Hannah Wolfe
7ebc7f7ff1 Merge pull request #6126 from sebgie/option-restore 
Restore options
 2015-12-02 12:13:36 +08:00
Hannah Wolfe
f8a05c533a Merge pull request #6154 from kevinansfield/use-embers-jquery 
Remove `$` from jshint's predef, always use Ember's `$`
 2015-12-02 12:07:54 +08:00
Hannah Wolfe
9f4c6957de Merge pull request #6155 from StevenMcD/issue_6140 
Add .git folder to ignore folders list
 2015-12-02 12:07:25 +08:00
Hannah Wolfe
1ba9929c59 Merge pull request #6058 from sebgie/middleware-refactor 
OAuth Middleware refactor
 2015-12-02 12:07:01 +08:00
Kevin Ansfield
413d999462 Remove $ from jshint's predef, always use Ember's $ 
no issue
- fixes problems with "re-definition of $" errors
 2015-12-01 20:52:25 +00:00
Sebastian Gierlinger
ee275f4d0c OAuth Middleware refactor 
refs #5286
- moved oauth server initialization to oauth.js
- moved generateAccessToken() to oauth.js
- added tests
 2015-12-01 21:20:11 +01:00
StevenMcD
6956985c28 Add .git folder to ignore folders list 
closes #6140
- simply added '.git' to the list of folder names to ignore when checking for valid themes.
 2015-12-01 21:14:23 +02:00
Kevin Ansfield
81765c6af2 Fix sub-dir being added to navigation urls when installed in sub-dir 
refs #4989
- fix handling of urls relative to base domain when ghost is installed in a sub folder

Fixes an issue when ghost was installed to a sub-dir, e.g. `example.com/blog` and an attempt to link to `example.com/` or `example.com/something-else` would always be re-written to `example.com/blog/` or `example.com/blog/something-else`.
 2015-12-01 15:23:21 +00:00
Sebastian Gierlinger
84c8149f6a Merge pull request #6152 from kevinansfield/cleanup-dependency 
Remove unused `ember-resize` dependency
 2015-12-01 14:58:24 +01:00
Kevin Ansfield
063f2c318c Merge pull request #6147 from garyc40/bug-uploader-bind 
Properly binds "this" in uploader.js
 2015-12-01 13:08:00 +00:00
Kevin Ansfield
f37a4b5580 Remove unused ember-resize dependency 
no issue
- removes `ember-resize` dep that crept back in under the radar in the Ember 2.2 update
- updates `ember-cli-build`'s test dependencies to match the format specified in http://ember-cli.com/managing-dependencies/#test-assets
 2015-12-01 11:03:53 +00:00
Kevin Ansfield
4ca82ed780 Merge pull request #5970 from acburdine/ember-2.1 
Ember & Ember-Data 2.2 update
 2015-12-01 10:56:52 +00:00
Hannah Wolfe
65fcd53f33 Merge pull request #6143 from acburdine/remove-casper 
Remove casperjs from travis setup
 2015-12-01 14:33:18 +08:00
Hannah Wolfe
8dbef11bc5 Updated node version text in README.md 
no issue

- update README to match the new version support
 2015-12-01 14:09:16 +08:00
Hannah Wolfe
395079cd2f Unify code for picking a template to render with 
refs #5091

- 100% coverage for new frontend/templates file
- new module handles the logic for determining which template to render with
 2015-12-01 12:05:46 +08:00
Gary Cao
e4c10c9688 Properly binds "this" in uploader.js 
closes #6146
 2015-12-01 12:50:31 +09:00
Austin Burdine
366e2fe3da deps: ember/ember-data@2.2.0 2015-11-30 12:23:47 -06:00
Kevin Ansfield
c884e67090 Merge pull request #6113 from acburdine/ember-cli-1.13.12 
Update Ember-CLI to 1.13.13
 2015-11-30 18:01:14 +00:00
Austin Burdine
ea64e5f8b6 remove casperjs from travis setup 2015-11-30 11:23:09 -06:00
Austin Burdine
7cbe7281a8 deps: ember-cli@1.13.13 2015-11-30 11:21:39 -06:00
Hannah Wolfe
8d5d89fb4a Merge pull request #6074 from kevinansfield/separate-travis-suites 
Separate the client/server test suites on Travis
 2015-11-30 23:46:52 +08:00
Kevin Ansfield
a102eff0ed Separate the server/client/lint test suites on Travis 
no issue
- add separate grunt tasks for validating all/client/server test suites
- modify `grunt validate` to respect the `TEST_SUITE` env var if present
- default to `TEST_SUITE=server` on Travis
- add an individual builds to the Travis matrix that test the client and run linting as separate jobs
- don't run `ensureConfig` task if we're performing client-only tests

Previously we were duplicating the client tests and linting for every node and database version in our build matrix. Duplicating those tasks a waste of time/resources as the client tests are now completely isolated from the server and so different node/database versions have no effect. This PR is an attempt at removing the duplication to speed up our Travis runs.
 2015-11-30 15:21:08 +00:00
Sebastian Gierlinger
fc9d9096aa Merge pull request #6078 from kevinansfield/always-call-super 
Always call `_super` when using Ember hooks
 2015-11-30 14:12:31 +01:00