Commit Graph

3605 Commits

Author SHA1 Message Date
John O'Nolan
8d0d53b982 Clean up borders 2015-05-22 19:02:08 +01:00
John O'Nolan
804425aca3 Lighten up publish bar 2015-05-22 19:02:07 +01:00
John O'Nolan
51ea7e0eca Cleanup 2015-05-22 19:02:07 +01:00
Austin Burdine
f6a116b3c1 fix users template rendering 2015-05-22 19:02:07 +01:00
Austin Burdine
f2f10ac7a6 fixed extraneous div tag 2015-05-22 19:02:06 +01:00
John O'Nolan
c17c40a28c Content view 2015-05-22 19:02:06 +01:00
John O'Nolan
b6ab6c149e New settings headers 2015-05-22 19:02:06 +01:00
John O'Nolan
eadbf7c582 Integrate new admin frame 2015-05-22 19:02:05 +01:00
John O'Nolan
1daee7cff1 New onboarding markup and styles 2015-05-22 17:50:13 +01:00
Hannah Wolfe
da8752cc88 Merge pull request #5290 from josephwegner/chalk-colors-swap
replace colors with chalk everywhere
2015-05-21 16:28:41 +01:00
Hannah Wolfe
3ccf549ea7 Merge pull request #5260 from cobbspur/owner
Prevent multiple owner creation via importer
2015-05-21 16:03:31 +01:00
Hannah Wolfe
a330f08c7f Merge pull request #5303 from tushdante/master
Fixed the invite user email to include the email address of the user …
2015-05-21 15:20:14 +01:00
Hannah Wolfe
cbbf1e42ec Improve config-parser JSON handling
closes #5294

This improves a hack for parsing JSON to be more robust.
Now attempt to parse JSON, and if it's not possible it will fallback to treating the value is a string,
reverting the behaviour to what it would have been if we didn't have JSON parsing here.
2015-05-21 09:28:05 +01:00
Tushar Bhushan
3fca65a3c5 Fixed the invite user email to include the email address of the user who invited you
closes #5283
- due to the changes with the api call in pr #5159 the email address wasn't showing up
- modified the api call to fetch user data to pass the context object to the toJSON object
2015-05-20 15:49:35 -07:00
Jason Williams
8ecc48d0c9 Merge pull request #5302 from ErisDS/private-blog-cache-control
Cache control for private blogs
2015-05-20 17:03:28 -05:00
Jason Williams
7e89413037 Merge pull request #5301 from ErisDS/issue-5288
Use absolute frontend URL in admin
2015-05-20 16:27:31 -05:00
Hannah Wolfe
e088859a38 Use absolute frontend URL in admin
closes #5288

- use the config.blogURL as the frontend URL from the admin
- we know this is given to us without a trailing slash, so it's 100% safe to hard code this
- TODO: make all of the url generation a lot nicer i.e. #1833
2015-05-20 21:45:19 +01:00
Hannah Wolfe
f3174de9e2 Cache control for private blogs
no issue

- private blogs need to not be cached, so that the cookie is always checked
2015-05-20 21:44:42 +01:00
Hannah Wolfe
8adc8cb4d8 Merge pull request #5296 from emersonkeenan/master
Fix meta description for static pages
2015-05-20 09:16:37 +01:00
Sebastian Gierlinger
c6176e4d38 Merge pull request #5292 from ErisDS/preview-cache-invalidate
Cache invalidate for previews
2015-05-20 09:31:28 +02:00
Emerson Keenan
46ebbd8de2 Fix meta description for static pages
closes #5295
- modified meta_description helper to match meta_title helper for ‘page’
context
2015-05-20 13:05:33 +10:00
Hannah Wolfe
e5cc169bf7 Removing really old admin comments
refs #1773
2015-05-19 19:03:41 +01:00
Hannah Wolfe
023755c566 Cache invalidate for previews
no issue

- draft updates now need to affect the preview route
2015-05-19 18:32:00 +01:00
Joe Wegner
f26179ae6a replace colors with chalk everywhere
issue #5259
- removes the colors dependency
- adds in chalk dependency, and migrates everything to use that
- reduces some specs now that the log calls are cleaner
2015-05-19 11:07:40 -05:00
Hannah Wolfe
050b03d2bd Cache control middleware refactor
refs #5286

- split cache control middleware into its own file
- split out cache control tests
- add new mochacli command for running just middleware tests
2015-05-18 22:20:26 +01:00
Hannah Wolfe
4de1c29538 Password protect redirect optimisation
no issue

- Don't include r=%2F in the URL - we'll assume this is the default
- This is just a bit prettier
2015-05-16 20:48:54 +01:00
cobbspur
8298d2fa04 Update help link to point to slack
No Issue

- changes link from forum to slack on about page
2015-05-15 17:11:24 +01:00
cobbspur
261a862da1 Prevent multiple owner creation via importer
closes #4778

 - If import contains an owner that does not match original owner they are downgraded to admin
 - Change error message for locked users to more generic message to account for imported users
 - Adds duplicated user test
 - Process Roles and maps import roles to db roles
 - reduces export files in test fixtures

temp commit
2015-05-15 10:12:30 +01:00
Matt Enlow
b0b56e7a8e Merge pull request #5270 from ErisDS/helper-updates
Misc helper updates & fixes
2015-05-14 16:00:22 +02:00
Hannah Wolfe
03e5fcac66 Merge pull request #5223 from edsadr/api-featured-posts
API: Adding `featured` filter option to posts.browse
2015-05-14 11:57:44 +01:00
Hannah Wolfe
d11a91e75c Misc helper updates & fixes
refs #5205

- Ensure that pages are treated the same as posts in meta_title, add test
- Added a private-template body class for the private context, add test
- Added a missing test to is_spec.js
2015-05-14 11:42:29 +01:00
Adrian Estrada
107c9602c1 API: Adding featured filter option to posts.browse
Closes #5152
- Adds `featured` filter option to posts.browse method modifying the model to take it too
2015-05-13 16:18:50 -05:00
Jason Williams
b71294e45d Merge pull request #5265 from ErisDS/private-blog-theming
Theming updates for password protection
2015-05-13 15:39:22 -05:00
Hannah Wolfe
209bd52935 Merge pull request #5262 from hex337/fix-5248-set-post-date
Allow setting a post date using a single digit day.
2015-05-13 20:06:16 +01:00
Hannah Wolfe
c3dda5e5c4 Theming updates for password protection
refs #4993, #5073

- Removed nonexistent helpers siteDescription and bodyClass from admin templates
- Changed password.hbs to private.hbs to match the route name
- added a new input_password helper for rendering the password input with the correct properties
- removed the forward input as this can be handled via urls only
- moved 'private' to routeKeywords
- added 'private' context
- minor update to text next to the password in settings
2015-05-13 19:48:24 +01:00
Hannah Wolfe
1f0fb3c5f3 Fixing lint error causing build to fail 2015-05-13 18:07:38 +01:00
Hannah Wolfe
3801b7a8ca Merge pull request #5256 from acburdine/passprotect2
Take password protection out of labs
2015-05-13 17:52:50 +01:00
Hannah Wolfe
96a3568c3d Merge pull request #5197 from PaulAdamDavis/new-upgrade-notifications
Move upgrade notification to /settings/about/
2015-05-13 16:47:46 +01:00
Jason Williams
4e3c469ff8 Merge pull request #5268 from ErisDS/issue-5258
Fixing 'undefined' issue with ghostPaths.url.join
2015-05-13 10:16:39 -05:00
Hannah Wolfe
8db1001d47 Fixing 'undefined' issue with ghostPaths.url.join
closes #5258
2015-05-13 15:08:04 +01:00
Harry Hope
1fc9ace8e1 move notifications inside main div 2015-05-12 16:35:21 -07:00
Alex Kleissner
25460b5387 Allow setting a post date using a single digit day.
closes #5248
- added new valid formats for the date formatter
- only the date formats where a single digit day makes sense were
changed
2015-05-12 15:42:02 -07:00
John O'Nolan
e99afc65b6 Merge pull request #5257 from dbalders/labs-input-style
Fix up Labs Styling
2015-05-12 19:07:43 +01:00
John O'Nolan
d7a9e09049 Merge pull request #5230 from iloabn/master
Update text showing the "Quote" feature in the tutorial post
2015-05-12 19:04:28 +01:00
Austin Burdine
bd2b206e4b finish up password protection
closes #5073
- takes password protection out of labs and moves it to general settings
- adds random-words generator to randomly generate passwords
2015-05-12 12:02:18 -06:00
David Balderston
c4e2eadc33 Fix up Labs Styling
No Issue

- Fixes import button not same height as upload button
- Fixes no space between import and upload on mobile
2015-05-11 23:12:31 -07:00
John O'Nolan
443eafeeca First styles for private blog login 2015-05-11 13:11:59 +01:00
Hannah Wolfe
37f92674b8 Merge pull request #5253 from jaswilli/roles-browse-filter
Fix up filtering implementation
2015-05-11 09:55:33 +01:00
Hannah Wolfe
79ff297490 Merge pull request #5243 from jaswilli/mail-errors
Check error object before dereference
2015-05-11 09:55:25 +01:00
Jason Williams
263bbd5092 Fix up filtering implementation 2015-05-10 20:48:32 -05:00