180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
Hannah Wolfe	aa659d29b6	JSLint updates - function spacing consistency ... - updating grunt-jslint to the latest version - fixing up function spacing	2013-06-06 21:38:12 +01:00
Hannah Wolfe	60d90967e1	issue 101 - updating the data model ... Added & removed many properties as required & fixed tests Updated & also cleaned up the fixtures, inc images Added order by published to the findPage query	2013-06-06 21:36:17 +01:00
Jacob Gable	e6f7c706cb	Permissions / ACL ... - Created Role model - Created Permission model - Linked Users->Roles with a belongsToMany relationship - Linked Permissions to Users and Roles with a belongsToMany relationship - Created permissions helper with functions for initializing and checking permissions (canThis) - Unit tests for lots of things	2013-06-06 08:15:10 +01:00
ErisDS	d047692c73	Removing the tmpl directory from jslint	2013-06-06 08:10:58 +01:00
Matthew Harrison-Jones	c4f19af62f	Dashboard widget functionality ... Intial widget layout, with packery for drag and drop support. Adds ability to save the order of widgets in localstorage	2013-06-06 07:26:25 +01:00
Hannah Wolfe	12496918de	Merge pull request #109 from tgriesser/client-post ... Client Post	2013-06-04 06:53:15 -07:00
Tim Griesser	c4f6c99ca1	moving handlebars compile target, adding notification when saving post, using Ghost.View rather than modifying Backbone.View's prototype	2013-06-04 08:41:25 -04:00
Tim Griesser	524462e164	Merge branch 'master' into client-post ... * master: Adding proper copyright info for Ghost Foundation Amending pagination test to have a longer timeout until #110 is done server half of #83, posts are draft by default, browse shows published by default Adding proper copyright info for Ghost Foundation	2013-06-04 08:03:51 -04:00
John O'Nolan	3dde7f7dca	Adding proper copyright info for Ghost Foundation	2013-06-04 00:51:54 +02:00
ErisDS	278e0cf877	Amending pagination test to have a longer timeout until #110 is done	2013-06-03 10:08:31 +01:00
Hannah Wolfe	93a59ece44	Merge pull request #108 from tgriesser/server-post ... "Post" model feature additions	2013-06-03 02:00:27 -07:00
Tim Griesser	e5ce70e175	Added models & collections for various pieces ... Saving post as draft, or publishing Added HBS parser for some client tmpls Parsing paginated posts Added grunt watch for hbs parsing on updates	2013-06-03 00:56:57 -04:00
Tim Griesser	30bd89587f	server half of #83, posts are draft by default, browse shows published by default	2013-06-03 00:56:17 -04:00
John O'Nolan	1ae2d0e192	Adding proper copyright info for Ghost Foundation	2013-06-02 09:10:11 +02:00
Tim Griesser	b7064185d4	server half of #83, posts are draft by default, browse shows published by default	2013-06-01 15:42:11 -04:00
Tim Griesser	c55a96083a	server side half of #83	2013-06-01 15:30:42 -04:00
Hannah Wolfe	d4f43c294c	Merge pull request #105 from tgriesser/fat-models-2 ... Closes #81	2013-06-01 11:06:09 -07:00
Tim Griesser	983c171fb0	simplifying the model structure, again	2013-06-01 11:14:05 -04:00
Gabor Javorszky	f783adbe7f	Issue #98, #4 Implemented countable.js	2013-06-01 12:52:20 +01:00
John O'Nolan	cf2d777ca4	Killing grid reference in main sass file	2013-06-01 11:20:38 +02:00
John O'Nolan	300d665e4a	Killing grid. This isn't used currently and the only place it will likely ever be used is in the Dashboard, which will have its own specifically tailored grid.	2013-05-31 15:38:12 +02:00
John O'Nolan	e7307f7f63	Cleaning	2013-05-31 15:36:55 +02:00
ErisDS	185eee2a6b	Implementing backbone for the blog / content view ... closes #64 - adds a full example of using backbone on the frontend remembered to squash this one!	2013-05-31 06:58:20 +01:00
Gabor Javorszky	33c28a88e8	filter on adminnavbar does nothing	2013-05-30 23:43:04 +01:00
Jacob Gable	a8bf3c962f	Ghost.init() ... - Modified jsonDataProvider to return promises for findAll and save - Move the dataProvider initialization into the Ghost.init() function. - Created basic unit test	2013-05-30 23:39:02 +01:00
Gabor Javorszky	ce5e757672	moved config into init function	2013-05-30 23:39:02 +01:00
Gabor Javorszky	e7c0d13f7c	#73: Remap app.locals done	2013-05-30 23:39:02 +01:00
ErisDS	237af40f2e	Revert "Merge branch 'fat-models' of github.com:tgriesser/Ghost into tgriesser-fat-models" ... This reverts commit 611e6a49ef, reversing changes made to a89dc1d123.	2013-05-30 23:34:53 +01:00
ErisDS	611e6a49ef	Merge branch 'fat-models' of github.com:tgriesser/Ghost into tgriesser-fat-models ... Conflicts: core/admin/assets/sass/layouts/dashboard.scss core/admin/views/dashboard.hbs core/shared/models/dataProvider.bookshelf.js	2013-05-30 22:23:18 +01:00
John O'Nolan	a89dc1d123	Merge pull request #95 from matthojo/New-Widgets ... Initial new Dashboard widgets - see #65	2013-05-30 04:15:10 -07:00
Matthew Harrison-Jones	826d20a902	New Widgets	2013-05-30 12:10:15 +01:00
John O'Nolan	c0f6f03f3b	Adding new icons: reply, repost, weather (sun/partial/cloud/rain/snow) for Dashboard. See #65	2013-05-30 11:39:14 +02:00
Tim Griesser	7cbbb3af4e	lint fixes & bcrypt-nodejs	2013-05-29 21:58:59 -04:00
Tim Griesser	cf9c2462fa	lint fixes	2013-05-29 18:28:24 -04:00
Tim Griesser	091790a525	merging with master	2013-05-29 18:26:10 -04:00
ErisDS	4083592724	Merge branch 'jquery' of github.com:JohnONolan/Ghost into JohnONolan-jquery	2013-05-29 22:16:02 +01:00
ErisDS	879f0983b2	Merge branch 'master' of github.com:JohnONolan/Ghost into JohnONolan-master	2013-05-29 22:06:43 +01:00
Hannah Wolfe	4571d05c76	Merge pull request #96 from jgable/fixTravisSqlLiteErrors ... Fix Travis Errors	2013-05-29 12:12:05 -07:00