890 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Hannah Wolfe	4307f48084	Merge pull request #655 from cobbspur/userprofile ... User Profile Image Upload	2013-09-09 00:59:57 -07:00
John O'Nolan	1e7e6631bd	Added styles for forgotten password screen	2013-09-09 08:58:24 +02:00
Sebastian Gierlinger	e51a14ee90	Clean up settings/general screen ... Closes #345 - added blog description to general screen - removed content screen from sidebar - removed beforeRender from settings front end - removed content screen from tests	2013-09-08 22:12:48 +02:00
John O'Nolan	229597d341	Input signup name into user profile	2013-09-08 21:16:40 +02:00
John O'Nolan	58b97497a3	New signup screen styling + new name field.	2013-09-08 20:39:55 +02:00
Hannah Wolfe	61e5212fd7	Merge pull request #654 from JohnONolan/center-login ... Center login	2013-09-08 11:33:34 -07:00
cobbspur	9ce0e9f4a0	User Profile Image Upload ... closes #280 - adds image uploader to user profile page. - click on cover picture or change cover button to open file upload modal. - created new upload modal that extends model to reduce some code duplication	2013-09-08 17:19:57 +01:00
John O'Nolan	4ed9ef487a	Get notifications in the right place on login ... Closes #588	2013-09-08 18:08:11 +02:00
John O'Nolan	f641bdbc4f	Turn off the register link	2013-09-08 18:00:58 +02:00
John O'Nolan	5ae36b00c9	Updating tests	2013-09-08 17:56:45 +02:00
John O'Nolan	4b40bb5aab	Center login form with CSS instead of JS	2013-09-08 17:12:25 +02:00
Hannah Wolfe	8a5f96b635	Merge pull request #640 from jgable/fixFancyPlugin ... Fix FancyFirstChar nested tag content	2013-09-07 15:57:58 -07:00
James Inman	ad46b853c4	Notifications are too long ... Closes #560, #436, #545, #437 * Added .s to the end of all post notification messages, per #437. * Added nice message when saving a draft per #436, also for other post statuses (your post will be published), etc. * Removed post name from notifications per #560 and #545. * Changed delete post error message to be "Your post could not be deleted. Please try again." NB: There may be an issue with the format of error messages which could be a separate bug?	2013-09-07 17:18:23 +01:00
John O'Nolan	19c83f90d1	Merge pull request #647 from jfi/iss643 ... Shortcut for italic inserts _ instead of *	2013-09-07 08:46:09 -07:00
James Inman	4c72a5e328	Shortcut for italic inserts _ instead of * ... Closes #643 Pressing Ctrl + I/Cmd + I when text is selected in Markdown mode now inserts _ instead of * around the selected text.	2013-09-07 16:38:04 +01:00
Jacob Gable	e56a0badb5	Fix FancyFirstChar nested tag content ... Added some white space skipping and inner tag checking to the fancify method.	2013-09-06 20:32:20 -05:00
Hannah Wolfe	fa37a56922	Updating to latest Casper	2013-09-06 18:51:22 +01:00