307 Commits

Author	SHA1	Message	Date
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
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
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	320bb311bc	Merge pull request #131 from javorszky/iss82-2 ... Registration no longer hangs on duplicate emails	2013-06-11 04:41:22 -07: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
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
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
Ricardo Tomasi	e2b3c40a34	Migrate settings page to Backbone	2013-06-08 19:36:54 -03:00
Ricardo Tomasi	c82e5976cc	Changes to Settings Model ... - add email default setting to fixture - make settings a single model - create UNIQUE index on setting keys	2013-06-08 19:24:21 -03: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
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	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
Tim Griesser	983c171fb0	simplifying the model structure, again	2013-06-01 11:14:05 -04: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
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
Tim Griesser	7cbbb3af4e	lint fixes & bcrypt-nodejs	2013-05-29 21:58:59 -04:00
Tim Griesser	091790a525	merging with master	2013-05-29 18:26:10 -04:00
Gabor Javorszky	8ffa03f775	Duplicate user, error handling, password in fixture	2013-05-27 23:04:09 -05:00
Jacob Gable	c699121049	Add ghostNav helper and filter for themes; closes #47	2013-05-27 22:59:01 -05:00
Tim Griesser	a204a96cda	a bit of organizing/simplifying/fattening the models	2013-05-27 13:30:03 -04:00
Hannah Wolfe	f4368a2744	Merge pull request #76 from tgriesser/pagination ... Pagination	2013-05-27 10:27:38 -07:00
Gabor Javorszky	18166337b8	Replaced bcrypt with bcrypt-nodejs	2013-05-27 17:38:53 +01:00
Tim Griesser	e9696fcec2	basic pagination, with tests	2013-05-27 11:24:06 -04:00
Tim Griesser	4d0b2ee0c4	Merge branch 'master' into pagination ... * master: done handler in final then, to ensure errors in last block are reported missing a done or two using grunt validate for npm test, fixing random jslint errors using promises correctly in tests adding mocha, getting npm test working	2013-05-27 10:11:55 -04:00
Tim Griesser	000e4e6a00	beginning of pagination api	2013-05-26 20:49:38 -04:00
Tim Griesser	4a318e9a6a	using grunt validate for npm test, fixing random jslint errors	2013-05-26 20:15:46 -04:00
Tim Griesser	724592ec5f	cleaning up args, allowing opts to be passed to the various bookshelf calls	2013-05-26 20:04:22 -04:00
Hannah Wolfe	5b63fcf399	Merge pull request #72 from jgable/errorHandlers ... Error handlers and tests	2013-05-26 12:37:49 -07:00
ErisDS	e23381d17b	Fixing JSLint and the Mocha api tests	2013-05-26 20:25:17 +01:00
Jacob Gable	ee610c6fc6	Error handlers	2013-05-26 13:51:58 -05:00
Hannah Wolfe	1590a424ef	Merge branch 'promises' of github.com:tgriesser/Ghost into tgriesser-promises ... Conflicts: core/shared/models/dataProvider.bookshelf.users.js	2013-05-26 19:44:34 +01:00
Tim Griesser	52911c7a50	more consistent use of promises	2013-05-26 13:44:01 -04:00
Jacob Gable	9ec2396213	Fix JSLInt errors and port existing nodeunit tests to mocha	2013-05-26 12:34:05 -05:00
Jacob Gable	05ca58951b	Merge changes from upstream	2013-05-25 11:55:23 -05:00
Jacob Gable	601e261439	Fixing tests and adding settings provider.	2013-05-25 11:48:15 -05:00
Ricardo Tomasi	1202b11a90	Crude post delete functionality, closes #42	2013-05-24 09:02:59 -03:00
Jacob Gable	a758db1c5f	Merging with upstream master changes; settings provider	2013-05-24 04:13:32 +00:00
Jacob Gable	242367e228	Bookshelf provider abstraction and tests	2013-05-23 23:02:41 -05:00
Ricardo Tomasi	1af28bc2ac	Working settings	2013-05-23 10:57:37 -03:00
Ricardo Tomasi	28bfa8feeb	missing brace	2013-05-23 09:30:38 -03:00
Ricardo Tomasi	245421a512	settings data provider and api	2013-05-23 09:23:34 -03:00
Ricardo Tomasi	4860cccef9	Define Settings models	2013-05-23 09:20:59 -03:00
Gabor Javorszky	ab8781d115	Added user authentication and registration	2013-05-21 02:03:35 +01:00
Hannah Wolfe	2e28a1a8c2	Fixing broken knex_init reference	2013-05-19 20:17:21 +01:00
Hannah Wolfe	325ded8a12	Cleaning up old juggling stuff in a separate commit	2013-05-16 22:16:44 +01:00
Hannah Wolfe	ef94f3b778	closes #28 - reimplements posts with bookshelf ... This involves switching column names to snake_case which requires template updates in both the admin and in casper	2013-05-16 22:16:09 +01:00
Hannah Wolfe	58926d1ce4	Updating controllers to use the api + some minor changes to the api calls	2013-05-16 21:56:26 +01:00
Hannah Wolfe	bb6880ea49	closes #33 - api example ... Moving towards using an API which we can both expose publicly, and use internally. Due to issues with JugglingDB, this breaks updating contentHTML on edit Also, language, status, featured etc are all no long set / updated.	2013-05-16 12:21:13 +01:00
Hannah Wolfe	17d421bfcc	Initial commit to GitHub repo	2013-05-11 17:44:25 +01:00