Commit Graph

6618 Commits

Author SHA1 Message Date
Hannah Wolfe
38e3654bbe Merge pull request #6875 from king6cong/role-id-fix
roles_users.id is not necessarily the same as roles_users.user_id
2016-05-23 09:07:20 +01:00
oregami
834d25b66b fix query user 2016-05-23 11:40:27 +08:00
Hannah Wolfe
8c81c919a8 Merge pull request #6872 from TryGhost/greenkeeper-should-8.4.0
Update should to version 8.4.0 🚀
2016-05-22 13:16:36 +01:00
Hannah Wolfe
6317028842 Merge pull request #6873 from kevinansfield/update-client
Update Ghost-Admin
2016-05-22 13:16:22 +01:00
Kevin Ansfield
e941344b52 Update Ghost-Admin
no issue

Changelog:
- dependency updates
2016-05-22 10:02:50 +01:00
greenkeeperio-bot
66529ea2af chore(package): update should to version 8.4.0
https://greenkeeper.io/
2016-05-21 12:35:28 +01:00
Hannah Wolfe
7e53389bc8 Merge pull request #6871 from TryGhost/greenkeeper-intl-1.2.3
Update intl to version 1.2.3 🚀
2016-05-21 11:25:02 +01:00
greenkeeperio-bot
8c24068db4 chore(package): update intl to version 1.2.3
https://greenkeeper.io/
2016-05-21 00:30:26 +01:00
Hannah Wolfe
dc8c947e43 Merge pull request #6858 from TryGhost/greenkeeper-oauth2orize-1.3.0
Update oauth2orize to version 1.3.0 🚀
2016-05-20 21:11:34 +01:00
greenkeeperio-bot
7ea9da919c chore(package): update oauth2orize to version 1.3.0
https://greenkeeper.io/
2016-05-20 21:11:28 +01:00
Hannah Wolfe
9078113911 Merge pull request #6835 from TryGhost/greenkeeper-jsonpath-0.2.3
Update jsonpath to version 0.2.3 🚀
2016-05-20 21:11:14 +01:00
Hannah Wolfe
1707c0c6ff Merge pull request #6837 from TryGhost/greenkeeper-sqlite3-3.1.4
Update sqlite3 to version 3.1.4 🚀
2016-05-20 21:11:08 +01:00
Hannah Wolfe
6e74e16169 Merge pull request #6843 from TryGhost/greenkeeper-intl-1.2.2
Update intl to version 1.2.2 🚀
2016-05-20 21:11:01 +01:00
greenkeeperio-bot
0776d4e6e0 chore(package): update jsonpath to version 0.2.3
https://greenkeeper.io/
2016-05-20 21:09:49 +01:00
greenkeeperio-bot
5ca641a98d chore(package): update sqlite3 to version 3.1.4
https://greenkeeper.io/
2016-05-20 21:09:49 +01:00
greenkeeperio-bot
912a4aa83b chore(package): update intl to version 1.2.2
https://greenkeeper.io/
2016-05-20 21:09:49 +01:00
Hannah Wolfe
f0cd94f2c6 Merge pull request #6853 from TryGhost/greenkeeper-should-8.3.2
Update should to version 8.3.2 🚀
2016-05-20 21:09:35 +01:00
greenkeeperio-bot
f5d34d2ae1 chore(package): update should to version 8.3.2
https://greenkeeper.io/
2016-05-20 21:08:38 +01:00
Hannah Wolfe
9e39dcc160 Merge pull request #6851 from TryGhost/greenkeeper-bluebird-3.4.0
Update bluebird to version 3.4.0 🚀
2016-05-20 21:08:22 +01:00
greenkeeperio-bot
cd54e54070 chore(package): update bluebird to version 3.4.0
https://greenkeeper.io/
2016-05-20 21:07:15 +01:00
Hannah Wolfe
53ec943e0d Merge pull request #6820 from TryGhost/greenkeeper-compression-1.6.2
Update compression to version 1.6.2 🚀
2016-05-20 21:06:59 +01:00
kirrg001
ff132fd934 timezones: support permalinks based on current timezone
issue #6406
- redirect date permalink if timezone changed
- create permalinks based on blog TZ
- post-lookup fn is now more generic
2016-05-20 18:14:19 +02:00
Aileen Nowak
38a261daac timezones: Always use the timezone of blog setting
closes #6406
- adding timeZone Service to get the offset (=timezone reg. moment-timezone) overall available
- new publishedAtOffset date as CP using timeZone service and moment-timezone to calculate offset incl. DST
- removing timezone-obj transform as it became obsolete with moment-timezone
- reading timezones from configuration/timezones api endpoint
- adding a moment-utc transform to only work with utc times in backend
- when switching the timezone in the select box, the user will be shown the local time of the selected timezone
- added clock service to show actual time ticking below select box
- default timezone is '(GMT) Greenwich Mean Time : Dublin, Edinburgh, London'
- if no timezone is saved in the settings yet, the default value will be used
- showing local time in 'Publish Date' when it's a draft and no actual publishedAt value exists
- Removed the format 'DD MMM YY @ HH:mm (UTC Z)' which resolves to '01 Jan 16 @ 14:00 (UTC +02:00)'
- Changing the date.js helper in core/server for moment-timezone
- Fix timezone select: updates `selectedTimezone` to return the matching object from `availableTimezones`
- Including timezones in test for date-helper
- update to moment-timezone 0.5.1
- moving form-group of 'selectTimezone' further up so
- Tests:
	- Set except for clock service in test env
	- adding fixtures to mirage
	- adding 'service.ajax' to navigation-test.js
	- adding 'service:ghostPaths' to navigation-test.js
- Code improvements
- Changing clockservice to ES6
2016-05-20 13:59:45 +02:00
greenkeeperio-bot
0167efcc33 chore(package): update compression to version 1.6.2
https://greenkeeper.io/
2016-05-20 11:34:19 +01:00
Hannah Wolfe
3736d8689b Merge pull request #6836 from TryGhost/greenkeeper-bookshelf-0.9.5
Update bookshelf to version 0.9.5 🚀
2016-05-20 11:34:03 +01:00
greenkeeperio-bot
7f465ea57a chore(package): update bookshelf to version 0.9.5
https://greenkeeper.io/
2016-05-20 10:54:18 +01:00
Hannah Wolfe
d7c2376f1a Merge pull request #6815 from TryGhost/greenkeeper-lodash.tostring-4.1.3
Update lodash.tostring to version 4.1.3 🚀
2016-05-20 10:54:05 +01:00
Hannah Wolfe
e80b1df982 Merge pull request #6863 from kevinansfield/fix-grunt-init
Fix order of subtasks in `grunt init`
2016-05-19 17:18:01 +01:00
Kevin Ansfield
d22fe2385f Fix order of subtasks in grunt init
no issue
- moves the `update_submodules` task to be first to ensure we the client code is in place ready for the ember/bower tasks
2016-05-19 16:13:52 +01:00
Austin Burdine
c25653bd4f Merge pull request #6862 from TryGhost/admin-split
Extract admin client into a separate project / submodule
2016-05-19 08:21:08 -06:00
Kevin Ansfield
76826a385d Add Admin-Client as submodule at core/client
no issue
- import the now separated [Ghost-Admin](https://github.com/TryGhost/Ghost-Admin) project as a submodule in it's original location of `core/client`
2016-05-19 14:20:18 +01:00
Kevin Ansfield
1b85d67e0e Remove split Ghost-Admin code 2016-05-19 14:14:32 +01:00
Hannah Wolfe
72c6cf7f93 Version bump to 0.8.0 2016-05-18 22:28:23 +01:00
Hannah Wolfe
b3448fa294 Merge pull request #6857 from TryGhost/fix-editor-with-wrapped-images
Fix broken editor when content contains wrapped images
2016-05-18 22:25:21 +01:00
Kevin Ansfield
d19dd52cf6 Fix broken editor when content contains wrapped images
no issue
- don't assume that the upload element that is being replaced is top-level, target the element's parentNode rather than the overall fragment
2016-05-18 21:52:07 +01:00
Sebastian Gierlinger
e35e037c1a Merge pull request #6856 from ErisDS/logo-fix
Don't clobber blog.logo in metadata
2016-05-18 20:54:09 +02:00
Hannah Wolfe
6737427ce9 Don't clobber blog.logo in metadata
- Ghost logo suddenly appearing was raised as an issue in slack
- This copies the blog object, so that the logo doesn't get overridden
2016-05-18 19:21:45 +01:00
Hannah Wolfe
06cccd7e93 Merge pull request #6852 from kevinansfield/drag-drop-fix
Fix drag-n-drop files from Chrome's download bar
2016-05-18 10:28:46 +01:00
Kevin Ansfield
4666b1b8c1 Fix drag-n-drop files from Chrome's download bar
closes #6850
- HTML5 drag-n-drop has some weird inconsistencies around the `dragOver` event where it defaults the "drop" behaviour to nothing so you need to cancel the defaults and override
	- http://stackoverflow.com/questions/19526430/drag-and-drop-file-uploads-from-chrome-downloads-bar
2016-05-18 09:53:10 +01:00
Sebastian Gierlinger
d92897c109 Merge pull request #6849 from ErisDS/schema-https
Switch to using https for schema.org
2016-05-18 09:32:50 +02:00
Hannah Wolfe
5948277a95 Merge pull request #6848 from ErisDS/twitter-facebook
Improvements to twitter & facebook handling
2016-05-17 20:59:15 +01:00
Hannah Wolfe
f3de80ebe9 Switch to using https for schema.org
closes #6846

- Using http causes mixed content warnings, using https does not
- Both http & https validate according to Google's validator
2016-05-17 19:32:03 +01:00
Kevin Ansfield
2640f774df Fix unwanted clearing of social inputs on blur with no edits
no issue
- updates the logic to expect `null` scratch values as the scratch values won't be set until the input value has changed
- adds tests for initial value display and regression tests for the cleared input bug
2016-05-17 19:14:14 +01:00
Aileen Nowak
6dbf610c8f Fixes error in validation
closes #6826

- refactors the validation of facebook and twitter input field in `general.js` and `user.js` controller
	- Example validations for facebook:
		- `facebook.com/username` will be corrected to the full URL
		- `user` will show error `Your Page name is not a valid Facebook Page name' for `general.js` and `Your Username is not a valid Facebook Username` for `user.js` as the username in facebook has to be at least 5 characters long
		- `twitter.com/username` will be autocorrected to the valid facebook URL incl. the `username`
	- Example validations for twitter:
		- `twitter.com/user_` will be corrected to the full URL
                - `user:99` will show error `Your Username is not a valid Twitter Username`
                - `facebook.com/username` will be autocorrected to the valid twitter URL incl. the `username`
- updates both acceptance tests
- adds further validation for facebook pages in general settings and user. Submitting a url which incl. `/page/` or `/pages/` will now accept any username followed incl. further `/`.
- adds a custom transform `facebook-url-user` which will extract the username (if it's a facebook page, incl. `pages/`) to store only this in the backend
- uses the `twitter-url-user` transform now also for user
2016-05-17 17:44:23 +01:00
Hannah Wolfe
29c9e8b147 Update structured data for fb & twitter usernames
refs #6534

- twitter & facebook fields are changing to store usernames only
- use the new social url util to generate urls where necessary
- update tests
2016-05-17 16:40:09 +01:00
Hannah Wolfe
e96b60b850 Add helpers for facebook & twitter urls
refs #6534

- this PR assumes that we are now saving usernames only in the database for twitter & facebook
- adds a new social links utility which can generate twitter & facebook urls from the username
- adds a {{twitter_url}} and {{facebook_url}} helper which uses these
- adds a full suite of tests for the helpers & utils
2016-05-17 16:39:58 +01:00
Hannah Wolfe
7d7bfc3ece Merge pull request #6842 from kirrg001/fix/import-when-userid-is-0
fix: support successful import/export with user id 0
2016-05-17 10:15:23 +01:00
kirrg001
9c9283e0c9 fix: ensure import works when user id is 0 2016-05-16 20:47:44 +02:00
Kevin Ansfield
06a2920333 Merge pull request #6838 from acburdine/esa-1.1
deps: ember-simple-auth@1.1.0
2016-05-16 11:51:23 +02:00
Kevin Ansfield
23d73e2725 Merge pull request #6834 from ErisDS/woff
Removing very old fix for woff files
2016-05-16 11:05:07 +02:00