754 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannah Wolfe	f84de01dc0	Merge pull request #698 from skattyadz/issue-642 ... Allow UPPERCASE in tag names	2013-09-11 06:53:24 -07:00
Hannah Wolfe	821106b5f0	Merge pull request #697 from jamesbloomer/619-image-upload-overwrites-existing-images-merge ... Ensure image uploads do not overwrite if they have the same name	2013-09-11 06:51:55 -07:00
Hannah Wolfe	d89b457257	Merge pull request #693 from gotdibbs/Issue511 ... Remove publish status reversion on failed save	2013-09-11 06:38:37 -07:00
Hannah Wolfe	61444bcf9a	Merge pull request #692 from gotdibbs/Issue352 ... Publish button fixes	2013-09-11 06:37:26 -07:00
Hannah Wolfe	695d2faeaa	Merge pull request #681 from matthojo/Notifications-On-Mobile ... Improved visibility of notifications on mobile devices	2013-09-11 06:35:51 -07:00
Adam Howard	90549fbb07	Allow UPPERCASE in tag names ... Fixes #642 Fairly self-explanatory	2013-09-11 00:38:45 +01:00
jamesbloomer	3e28803672	Ensure image uploads do not overwrite if they have the same name ... closes #619 - check if uploaded image name exists in month/year path - if unique then save - if not unique then add -1 to the end of the name eg. image-1.jpg - if image-1.jpg exists then increment to -2 - keep going until a unique name is found - uses tail recursion as normal path will be to save the first filename and deep recursion will be the exception - (the alternative of loading the names of all the files in the directory could result in a large in memory array)	2013-09-10 22:02:28 +01:00
Hannah Wolfe	687d7ed72d	Changing icon setting to cover in defaults ... issue #571 - forgot to do this	2013-09-10 20:05:35 +01:00
John O'Nolan	79975e4697	Merge pull request #694 from M165437/mobile-friendly-ui ... Add breakpoint to switch to mobile friendly form layout	2013-09-10 09:47:10 -07:00
Michael Schmidt-Voigt	4d29a36b75	Add breakpoint to switch to mobile friendly form layout ... issue #149 - added breakpoint at 550px to change form layout - labels are on top of form fiels - form fields change to 100% width	2013-09-10 13:30:06 -03:00
William Dibbern	48a4c30fef	Remove publish status reversion on failed save ... Fixes #511 - Removed logic to revert publish status back to page default on error.	2013-09-10 09:42:27 -05:00
William Dibbern	2329b34be7	Publish button fixes ... Fixes #352 - Ensure publish button's default status is set in the `render` function. - Ensure publish button's popup arrow has animation reverted when a status has been selected. - Bumped up timeout in failing mocha test for exports-002.	2013-09-10 09:32:02 -05:00
John O'Nolan	9031ae49b2	Merge pull request #689 from matthojo/User-Menu-Links ... Removed unused user menu items and linked "Help / Support" to the right place	2013-09-10 07:16:11 -07:00
Matthew Harrison-Jones	2280276fdd	Removed unused user menu items and linked "Help / Support" to the right place ... Also updated CasperJS tests to support changes	2013-09-10 15:05:42 +01:00
John O'Nolan	087872484b	Merge pull request #688 from matthojo/Post-Menu ... Temporarily remove unused Post Menu options	2013-09-10 06:03:05 -07:00
Matthew Harrison-Jones	84c2767da6	Temporarily remove unused Post Menu options	2013-09-10 13:53:01 +01:00
Hannah Wolfe	9d7db3155d	Merge pull request #678 from matthojo/iOS-White-Space-Bug ... Bug Fix: Fixed extra white space on landscape to portrait orientation change	2013-09-10 02:53:49 -07:00
Hannah Wolfe	0b69b60d77	Merge pull request #676 from ErisDS/markdown-fixes ... Further improvements to markdown implementation	2013-09-10 02:50:16 -07:00
Matthew Harrison-Jones	0e3cefa770	Bug Fix: Fixed extra white space on landscape to portrait orientation change ... This breaks focus on focused element to keep layout. This is because the layout still breaks if an element is focused, and you cannot trigger the system keyboard through Javascript to refocus an element after.	2013-09-10 10:21:43 +01:00
Hannah Wolfe	315c932cec	Merge pull request #576 from tgriesser/bookshelf-upgrade	2013-09-10 09:50:07 +01:00
Tim Griesser	bfded1e4c1	bumping bookshelf & knex deps	2013-09-10 09:48:17 +01:00
Hannah Wolfe	1baa2c46fb	Upgrading sqlite3 to remove build dependencies ... - This is the best commit ever. - sqlite3 no longer has any build dependencies on major platforms - HUZZAH	2013-09-10 08:46:07 +01:00
Hannah Wolfe	773fe0f3d9	Further improvements to markdown implementation ... closes 644 - replaced showdown's implementation of bold and emphasis with a version close to marked's - reverted the underscore-in-word handling to only deal with 2 or more underscores & commented the test this causes to fail - this was causing problems with double underscores.	2013-09-09 22:55:32 +01:00
Hannah Wolfe	48601ee881	Merge pull request #674 from cobbspur/loadfix ... fixed loading icon bug	2013-09-09 12:19:56 -07:00
cobbspur	f3d58f5ecb	fixed loading icon bug ... closes #662 - stops loading cat icon appearing by mistake	2013-09-09 20:18:35 +01:00
Hannah Wolfe	fd3206311b	Merge pull request #673 from JohnONolan/fav ... New favicon	2013-09-09 11:37:08 -07:00
John O'Nolan	1d2f6c96d3	New favicon	2013-09-09 20:14:34 +02:00
Hannah Wolfe	b115ebf8ea	Merge pull request #636 from gotdibbs/Issue592	2013-09-09 18:34:30 +01:00
William Dibbern	9064914829	Added redirect to get rid of /page/1/ ... Fixes #592 - Added *permanent* redirect to ensure `/page/1/` isn't used and that `/` is used instead. - Added pageUrl helper (and unit tests) to generate client side url fragment for blog pages conforming to the above standard. - Updated pagination helper to use new `pageUrl` theme helper. - Added functional tests for redirects and added scaffolding for functional frontend tests in general.	2013-09-09 18:32:44 +01:00
Hannah Wolfe	6fd3926156	Merge pull request #672 from ErisDS/blog-cover ... Added blog cover image	2013-09-09 10:24:26 -07:00
Hannah Wolfe	6417ef778a	Added blog cover image ... closes #571 - added blog cove beneath logo, wired it up to the {{@blog}} globals - updated casper - also deleted settings/content	2013-09-09 18:13:19 +01:00
Hannah Wolfe	03fbffc789	Merge pull request #671 from ErisDS/upload-file-fix ... Fix for file upload paths on Windows	2013-09-09 10:06:45 -07:00
Hannah Wolfe	0b3f2797e9	Fix for file upload paths on Windows ... closes #669 - override incorrect path separators with / in the src for an image.	2013-09-09 17:19:58 +01:00
Hannah Wolfe	bbbfed9921	Temporary aliasing on the User model ... issue #389 - Output only aliases (saving data with these keys won't work) gives us the right names in the theme API	2013-09-09 15:25:20 +01:00
Hannah Wolfe	add7136bd6	Merge pull request #660 from sebgie/issue#626 ... Remove {{nav}} helper	2013-09-09 06:11:06 -07:00
Matthew Harrison-Jones	9d41e23cb0	Improved visibility of notifications on mobile devices	2013-09-09 14:09:34 +01:00
Hannah Wolfe	718c285808	Merge pull request #648 from jfi/iss545 ... Notifications are too long	2013-09-09 04:48:41 -07:00
Hannah Wolfe	d01a4c4662	Merge pull request #665 from JohnONolan/ie ... Remove detection for IE7 and lower	2013-09-09 04:36:40 -07:00
John O'Nolan	42a011d6a9	Introducing chromeframe, correcting content type meta tag.	2013-09-09 13:03:36 +02:00
Sebastian Gierlinger	1da0a15be2	Remove {{nav}} helper ... closes #626 - removed nav from config.js - removed navHelper - removed navHelper tests - removed core/server/filters	2013-09-09 13:00:56 +02:00
Hannah Wolfe	a86e6b1a71	Merge pull request #664 from ErisDS/email-template ... Updating forgotten password email template	2013-09-09 03:59:31 -07:00
Hannah Wolfe	2c186cb769	Merge pull request #663 from JohnONolan/byebye-images ... Kill off old image fixtures and ignore user-uploaded images	2013-09-09 03:58:57 -07:00
John O'Nolan	935afbf873	Remove detection for IE7 and lower	2013-09-09 12:58:48 +02:00
Hannah Wolfe	946544996c	Updating forgotten password email template ... closes #288 - added sign off using url from config	2013-09-09 11:51:12 +01:00
John O'Nolan	64ad0214db	Kill off old image fixtures and ignore user-uploaded images	2013-09-09 12:44:38 +02:00
John O'Nolan	d85ec43fb9	Updated modal styles	2013-09-09 11:20:44 +02:00
Hannah Wolfe	1e90c2dfbf	Merge pull request #661 from JohnONolan/uploader-bugs ... Added styling enhancements to image uploader	2013-09-09 02:00:50 -07:00
Hannah Wolfe	3f51d51e47	Merge pull request #656 from JohnONolan/signup-screen ... Signup screen	2013-09-09 01:59:32 -07:00
John O'Nolan	debae0e307	Added styling enhancements to image uploader	2013-09-09 10:33:42 +02:00
Hannah Wolfe	a69cb49105	Merge pull request #649 from sebgie/issue#345 ... Clean up settings/general screen	2013-09-09 01:32:35 -07:00