4817 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	53b758d127	Version bump to 0.6.4	2015-05-21 17:27:17 +01:00
Hannah Wolfe	085407c9b9	Upgrading Casper to 1.2.4	2015-05-21 17:04:08 +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	8e57a0eec0	Merge pull request #5304 from nii236/master ... Bumped up node-sqlite3 version number to fix broken build on non x86 …	2015-05-21 15:24:22 +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
Sebastian Gierlinger	dcb15b6408	Merge pull request #5305 from ErisDS/issue-5294 ... Improve config-parser JSON handling	2015-05-21 12:16:04 +02: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
John Nguyen	ab7d7cc798	Bumped up node-sqlite3 version number to fix broken build on non x86 devices such as the RPi	2015-05-21 15:25:34 +08: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
Jason Williams	efe3b5eb3c	Merge pull request #5293 from ErisDS/comment-remove ... Removing really old admin comments	2015-05-19 16:31:10 -05: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
Sebastian Gierlinger	26548a734a	Merge pull request #5287 from ErisDS/cache-control ... Cache control middleware refactor	2015-05-19 12:42:46 +02: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
Sebastian Gierlinger	3b30e34b77	Merge pull request #5284 from ErisDS/grunt-amends ... Improve grunt clean & add grunt test-ember	2015-05-18 15:47:43 +02:00
Hannah Wolfe	8e8f4125f4	Improve grunt clean & add grunt test-ember ... no issue - old grunt testem task didn't work - has been renamed and fixed - grunt clean task updated to clear out dependencies, making it more useful for helping fix cludged envs	2015-05-17 22:41:49 +01:00
Sebastian Gierlinger	f2228ab0a4	Merge pull request #5278 from ErisDS/password-imrpv ... Password protect redirect optimisation	2015-05-17 13:48:10 +02: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
Jason Williams	30c2adbf08	Merge pull request #5275 from ErisDS/release-update ... Removing test assets from release zip	2015-05-15 15:38:57 -05:00
John O'Nolan	eecfe7241e	Merge pull request #5277 from ErisDS/contrib-update ... Contrib guide refs slack instead of forum/irc	2015-05-15 19:26:42 +01:00
Hannah Wolfe	0011edd84e	Contrib guide refs slack instead of forum/irc ... - Slack is now considerably more active than both irc & the forums, so lets guide people to the best place to get help :) - Also updates a few more places to point to the wishlist as that is also working well	2015-05-15 19:21:21 +01:00
John O'Nolan	549b9abc8c	Merge pull request #5274 from cobbspur/link ... Update help link to point to slack	2015-05-15 17:25:53 +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
Hannah Wolfe	4a7a1c69ce	Removing test assets from release zip ... no issue - no need for test assets in the release zip, this reduces the size of the final zip	2015-05-15 16:35:22 +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
Hannah Wolfe	42013eedb5	Version bump to 0.6.3	2015-05-14 16:04:11 +01:00
Hannah Wolfe	94579d172d	Upgrading Casper to 1.2.3	2015-05-14 15:53:35 +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
John O'Nolan	d22b25521e	Turn this list into a list	2015-05-14 13:54:56 +01: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