TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-15 03:12:54 +03:00
Code Issues Projects Releases Wiki Activity
5,711 Commits 253 Branches 1,686 Tags 364 MiB
b5a8ac3a7d
Commit Graph

5711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Kevin Ansfield
571b9e783a Always call _super when using Ember hooks 
no issue
- review use of Ember core hooks and add a call to `this._super` if missing
- fix a few occurrences of using the wrong component lifecycle hooks that could result in multiple/duplicate event handlers being attached

`_super` should always be called when overriding Ember's base hooks so that core functionality or app functionality added through extensions, mixins or addons is not lost. This is important as it guards against issues arising from later refactorings or core changes.

As example of lost functionality, there were a number of routes that extended from `AuthenticatedRoute` but then overrode the `beforeModel` hook without calling `_super` which meant that the route was no longer treated as authenticated.
 2015-11-30 12:45:37 +00:00
Sebastian Gierlinger
e5d9865792 Merge pull request #6020 from kevinansfield/suave 
Use ember-suave and standardise client's es6 usage
 2015-11-30 12:46:39 +01:00
Kevin Ansfield
3d6856614f Use es6 across client and add ember-suave to enforce rules 
no issue
- add ember-suave dependency
- upgrade grunt-jscs dependency
- add a new .jscsrc for the client's tests directory that extends from client's base .jscsrc
- separate client tests in Gruntfile jscs task so they pick up the test's .jscsrc
- standardize es6 usage across client
 2015-11-30 10:41:01 +00:00
Kevin Ansfield
9437b8eeef Merge pull request #6108 from mixonic/no-rerender-selectors 
Unify mobile state in JS, drop resize
 2015-11-30 08:45:03 +00:00
Hannah Wolfe
1ce7f2251a Merge pull request #6136 from bhops/remove-405-test 
Remove unused base_test.js
 2015-11-30 10:06:26 +08:00
Brandon Hops
0a06af02d5 Remove unused base_test.js 2015-11-28 18:46:13 -08:00
Hannah Wolfe
55045ae784 Version bump to 0.7.2 2015-11-27 13:13:25 +08:00
Hannah Wolfe
2ea4f67dd4 Merge pull request #6131 from sebgie/issue#6106-1 
Origin Header revisited
 2015-11-27 00:32:51 +08:00
Hannah Wolfe
a8d13dd332 Merge pull request #6129 from kevinansfield/invalid-origin-errors 
Display error message on setup if origin doesn't match config.js url
 2015-11-27 00:25:57 +08:00
Hannah Wolfe
cd5188a32a Merge pull request #6130 from kevinansfield/missing-signin-error 
Fix missing error on signin when server has gone away
 2015-11-26 23:07:44 +08:00
Sebastian Gierlinger
245095c199 Origin Header revisited 
closes #6106
- added override for my-ghost-blog.com
- added local IP addresses to be allowed
- changed localhost/127.0.0.1 to be allowed in production
 2015-11-26 13:11:31 +01:00