37771 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jacob Gable	0c4ccc284b	Data import and export	2013-06-15 20:52:32 +00:00
Hannah Wolfe	1369789aec	closes #150 - Updating Grunt ... Grunt tasks are now hopefully a little bit less confusing Have updated the readme to match	2013-06-15 19:33:52 +01:00
Gabor Javorszky	78cbaf0387	/register/ => /signup/ ... Fixes issue #132. Also added `js-login-container` class to the signup box, as it wasn't faded in due to javascript not picking up the element.	2013-06-15 19:16:15 +01:00
Hannah Wolfe	7b932b9986	Merge pull request #160 from jgable/fixDeployPaths ... Fix relative paths for deployment	2013-06-15 10:53:48 -07:00
Jacob Gable	a63690a471	Fix relative paths for deployment ... In order to run with forever / supervisorctl, the relative paths need to be converted to full ones based on the __dirname.	2013-06-15 10:54:49 -05:00
Hannah Wolfe	b816225dca	Merge pull request #159 from jgable/fixRequireTree ... Error check and default set for require-tree.	2013-06-15 08:48:51 -07:00
Hannah Wolfe	c59e12549e	Merge pull request #158 from tgriesser/uuids ... Adding uuid's for the posts, users, settings	2013-06-15 08:48:26 -07:00
Jacob Gable	b4b8be2bb8	Error check and default set for require-tree.	2013-06-15 09:22:50 -05:00
Tim Griesser	a5b9274bb5	adding uuid's for the posts, users, settings	2013-06-15 10:16:20 -04:00
ErisDS	057791893f	Merge branch 'pr/155' ... Merging Pull Request 155	2013-06-15 11:31:36 +01:00
Hannah Wolfe	4307b8c94d	Changing Casper submodule to point to master	2013-06-15 11:23:29 +01:00
Gabor Javorszky	b0b11573f6	Restricting Admin user creation ... Solves #138. * Removed user and user_roles from fixture * Restricted user creation to one user. That user is id 1, is admin * Changed tests so they accommodate for this fact * Can not create new user (fails on test, flashes on signup)	2013-06-15 10:10:26 +01:00
Hannah Wolfe	aedd9d7131	Merge pull request #156 from javorszky/iss112 ... Replaced config.blogData with settings	2013-06-15 01:37:12 -07:00
Gabor Javorszky	81d317a122	Replaced config.blogData with settings ... Solves #112 * Removed config.blogData * Changed Ghost.init() to accommodate new settings bits * (data was already in the fixtures)	2013-06-15 00:39:27 +01:00
Matthew Harrison-Jones	0d75b737b8	Refactored users settings page ... Improved standards of CSS and also refactored HTML markup. Search bar also is implemented, with a prototype animation for displaying input field.	2013-06-14 14:01:33 +01:00
Hannah Wolfe	5d901e5238	Merge pull request #130 from jgable/buildTask ... Nightly build task	2013-06-13 23:08:22 -07:00
Hannah Wolfe	37fd6f7a06	Re-adding the image fixtures which I forgot to readd when I was moving them around	2013-06-13 21:44:18 +01:00
John O'Nolan	1fab45669e	Adjusting form styles and animations for checkboxes. Fixes #7	2013-06-13 14:31:16 +02:00
John O'Nolan	43db602b41	Merge pull request #145 from matthojo/Checkbox-Styling ... Removed the need for iCheck CSS dependency. See #7	2013-06-13 05:04:47 -07:00
John O'Nolan	5215387e07	Minor tweaks to login form animations and styles - fixes #134	2013-06-13 13:58:37 +02:00
Matthew Harrison-Jones	8d66cbd6e8	Removed the need for iCheck CSS dependency. ... Made all iCheck images into CSS and removed the iCheck CSS stylesheet.	2013-06-13 12:54:57 +01:00
John O'Nolan	ed8ccc2170	Merge pull request #143 from matthojo/Login-Screen ... Fixes login box being off centred on small screens	2013-06-13 04:36:12 -07:00
Matthew Harrison-Jones	de09e7d19c	Fixes login box being off centred on small screens ... Accounted for top offset to keep login container centred. Login container fades in on load. Tested on a variety of window sizes and appears to be centred on all of them (measured it to make sure).	2013-06-13 09:38:40 +01:00
John O'Nolan	f2e913ddfd	Merge pull request #141 from matthojo/Login-Screen ... Keep login centered, fixes #134	2013-06-11 22:48:28 -07:00
Matthew Harrison-Jones	94c8c94ad1	Fixes login staying centred ... Now included in `$(window).resize();` to update location of Login container. The login is now more of a visually 'true' centre, with the offset being more towards the top. Centring on resize, wasn't in original commit to remove one extra event listener.	2013-06-11 18:56:25 +01:00
John O'Nolan	2be5ce72ae	Merge pull request #140 from matthojo/Login-Screen ... Vertically center login form, fixes #134	2013-06-11 09:56:47 -07:00
Matthew Harrison-Jones	fbd54942b5	Center Login container	2013-06-11 17:42:56 +01:00
John O'Nolan	bdd29fafaf	Appearance => Theme	2013-06-11 17:57:02 +02:00
John O'Nolan	1267f91935	Refactor + Restyle login/register screens. See #134	2013-06-11 16:45:42 +02:00
John O'Nolan	7e1bd2922e	Reducing overzealous sass indenting for performance.	2013-06-11 15:32:56 +02:00
John O'Nolan	501e8695f2	Correcting login screen markup/styling issues, fixes #133	2013-06-11 15:01:02 +02:00
Hannah Wolfe	0a0039820d	Merge pull request #127 from matthojo/Keyboard-Shortcuts ... Added Keyboard Shortcuts to change Post Status and Save.	2013-06-11 05:24:36 -07:00
Hannah Wolfe	320bb311bc	Merge pull request #131 from javorszky/iss82-2 ... Registration no longer hangs on duplicate emails	2013-06-11 04:41:22 -07:00
Hannah Wolfe	06b5ab86fb	Merge branch 'pr119-merged' ... Conflicts: core/admin/views/settings.hbs	2013-06-11 11:56:01 +01:00
Hannah Wolfe	493cf6ea7f	Merge branch 'pr/126'	2013-06-11 10:30:00 +01:00
John O'Nolan	98b4b700ea	Merge pull request #123 from cobbspur/uploadercss ... HTML and CSS for image uploader, fixes #38.	2013-06-10 22:59:24 -07:00
Matthew Harrison-Jones	44575cdb25	Added Keyboard Shortcuts to change Post Status and Save. ... This also includes the updated Header tag shortcuts. Also fixes keyboard shortcuts being broken due to `this` not being passed into shortcut each function.	2013-06-10 22:52:24 +01:00
Gabor Javorszky	e0caddeee7	Registration no longer hangs on duplicate emails ... There was a return missing. This closes #82 again.	2013-06-10 21:26:20 +01:00
cobbspur	40d8b0321c	implements #38 html and scss for uploader ... - Fixed broken html - Added file input to html - Styling for hidden file input button - Styling for progress bar and loading - Added javascript classes for hooking file upload - Added loading image (cat)	2013-06-10 20:07:34 +01:00
Jacob Gable	d1300bb49c	Nightly build task ... Add a `grunt nightly` build task that copies needed files to a build folder, then zips them up for distribution. We can also add a tag and push it to github but I've only tested it with throwaway branches. I made some guesses about the build folder and dist folder. If you have a better way feel free to give some recommendations. Related to #102.	2013-06-10 09:00:32 -05:00
John O'Nolan	4a630af54a	Removing box-shadow() mixin references that are deprecated in Bourbon, missed in previous commit. See #44	2013-06-10 09:51:49 +02:00
Ricardo Tomasi	cc6bb94e74	remove default .active tab from template. fixes #125	2013-06-09 19:56:47 -03:00
Hannah Wolfe	b3775feba0	Merge branch 'pr/119' ... Conflicts: core/admin/assets/js/router.js core/admin/views/default.hbs core/admin/views/settings.hbs core/shared/data/fixtures/001.js	2013-06-09 21:41:07 +01:00
Gabor Javorszky	e271c6402f	Directory scanning on contents/themes and plugins ... This implements #106. * Added require-tree which is based off of @ricardobeat's module. Fully async. * I've moved active theme and active directory to settings from config as well. * Modified settings.hbs and settings.js to display the raw json under Settings/Appearance	2013-06-09 20:17:54 +01:00
Hannah Wolfe	1df9b6e90a	Merge pull request #121 from jgable/filterPriority ... Filter priorities	2013-06-09 12:12:04 -07:00
Hannah Wolfe	d3ac1c7fc7	Merge pull request #120 from jgable/permissable ... Implement a permissable interface on models	2013-06-09 12:00:03 -07:00
Jacob Gable	55d8ff75b4	Filter priorities ... Add the ability to specify a priority level when registering filters. Also change doFilter to execute filters in priority order. Closes #86	2013-06-09 11:16:25 -05:00
Hannah Wolfe	c733a1ac62	Merge pull request #114 from matthojo/Backbone-Widgets ... Initial Backbone Widgets	2013-06-09 06:24:08 -07:00
Matthew Harrison-Jones	2e44a1f845	Converted static Widgets to Backbone. ... Moved static HTML Widgets to Backbone. Might need to move Widget data else where to keep it clean. Will need to also implement API for future use.	2013-06-09 10:56:10 +01:00
Jacob Gable	1effc4e772	Implement a permissable interface on models ... Added checks to the canThis process for a `permissable()` function that would allow Models to override the permissions process.	2013-06-08 18:39:24 -05:00