Commit Graph

44 Commits

Author SHA1 Message Date
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
ErisDS
37d86e07bb Fixing bug in registration
Switching over to abstracted data provider meant that email_address
accidentally got passed to the model as email and therefore could not
be found. This is now resolved.
Also, added trailing slash to register route, which I believe should be there
2013-05-26 12:38:14 +00: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
Gabor Javorszky
b39efd2680 Made Ghost work with bourbon, grunt init works again 2013-05-25 15:11:30 +01:00
Hannah Wolfe
c7f07fd8ce Merge pull request #62 from ricardobeat/delete_post
Crude post delete functionality, closes #42
2013-05-24 14:10:22 -07:00
Jacob Gable
cc45be636f Merge branch 'master' of github.com:TryGhost/Ghost into usersAPI 2013-05-24 16:10:19 -05:00
Ricardo Tomasi
0d8866bc8e RESTful API 2013-05-24 09:17:46 -03:00
Ricardo Tomasi
1202b11a90 Crude post delete functionality, closes #42 2013-05-24 09:02:59 -03:00
Matthew Harrison-Jones
323f7c0fc8 Remove Compass for Bourbon 2013-05-24 11:07:34 +01:00
Gabor Javorszky
554a16377b Added logout functionality, helper links and more cookie time 2013-05-24 07:19:19 +01: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
76891afd08 jslint 2013-05-23 11:00:45 -03: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
9e77d32043 Add tests for API/settings 2013-05-23 09:23:35 -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
Ricardo Tomasi
b808f73eff First steps towards saving settings 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
7066593d78 closes #26 - admin login
There is now a login page. Trying to access any authenticated route will redirect you to a login page if you are not logged in.
Logging in works with the same hard-coded username and password & remembers you for a session.
Logging in will redirect you to your original route.
Flashes are present although they don't really appear in the right place.
2013-05-19 12:19:39 +01:00
Hannah Wolfe
27ce297b32 closes #43 - admin cleanup
Getting the admin views into a more consistent / happy state
2013-05-19 09:04:20 +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
e7b37f8671 Cleaning up global statement 2013-05-16 11:29:02 +01:00
Jacob Gable
7f7363c7fc Merging from upstream repo 2013-05-14 10:11:08 -05:00
Jacob Gable
b88e69a3cc Switch to grunt-jslint 2013-05-14 10:04:22 -05:00
Jacob Gable
13e7a51bb7 Add correct nomen setting and revert _post changes 2013-05-13 15:19:40 -05:00
Jacob Gable
6da08eaf3c Make stricter jshint rules, convert tabs to spaces 2013-05-13 14:18:20 -05:00
Matthew Harrison-Jones
94b9fe1099 Simple conversion of designed 'users' section.
Still needs search functionality.
2013-05-13 20:12:40 +01:00
Matthew Harrison-Jones
7ea1f2a7dc Remeber the last settings location 2013-05-13 18:45:59 +01:00
Matthew Harrison-Jones
8e7123dd84 Custom inputs using iCheck
See #7
2013-05-13 18:25:16 +01:00
Jacob Gable
99c13c02c0 Initial Grunt configuration 2013-05-12 08:40:59 -05:00
Hannah Wolfe
17d421bfcc Initial commit to GitHub repo 2013-05-11 17:44:25 +01:00