Commit Graph

89 Commits

Author SHA1 Message Date
Tim Griesser
000e4e6a00 beginning of pagination api 2013-05-26 20:49:38 -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
7a6e682a4b Merge branch 'master' of github.com:TryGhost/Ghost into errorHandlers 2013-05-26 13:52:20 -05: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
Hannah Wolfe
aae31780b0 Merge pull request #70 from jgable/testsCleanup
Tests cleanup; convert to mocha
2013-05-26 11:19:11 -07:00
Tim Griesser
52911c7a50 more consistent use of promises 2013-05-26 13:44:01 -04:00
Jacob Gable
c41a84c45d Remove nodeunit dependency 2013-05-26 12:40:25 -05:00
Jacob Gable
b54b7400e4 Remove grunt-contrib-nodeunit dependency 2013-05-26 12:39:55 -05:00
Jacob Gable
9ec2396213 Fix JSLInt errors and port existing nodeunit tests to mocha 2013-05-26 12:34:05 -05:00
Tim Griesser
2cad866734 adding bourbon to gitignore 2013-05-26 13:10:59 -04: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
Hannah Wolfe
c605c90d71 Merge pull request #68 from jgable/usersAPI
Bookshelf API Providers Abstraction and Tests; Closes #35
2013-05-25 23:40:21 -07:00
Hannah Wolfe
c6135cfaa2 Merge pull request #61 from ricardobeat/api_auth
API auth failures should respond with json, closes #49
2013-05-25 23:35:57 -07:00
Ricardo Tomasi
04c35161f8 API auth failures should respond with json, closes #49 2013-05-25 14:50:31 -03: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
Hannah Wolfe
bb67bcde40 Merge pull request #67 from javorszky/master
Added bourbonification
2013-05-25 08:28:49 -07:00
Gabor Javorszky
d002ad4444 added readme explanations 2013-05-25 15:23:53 +01:00
Gabor Javorszky
6f87ecc3ee added readme explanations 2013-05-25 15:22:53 +01: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
Hannah Wolfe
765d28943e Merge pull request #63 from ricardobeat/rest
RESTful API
2013-05-24 14:09:36 -07: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
John O'Nolan
3adbbebc45 Merge pull request #56 from matthojo/Bourbon
Replace Compass for Bourbon.io - fixes #44
2013-05-24 03:15:12 -07:00
Matthew Harrison-Jones
323f7c0fc8 Remove Compass for Bourbon 2013-05-24 11:07:34 +01:00
Hannah Wolfe
8dfd687fa8 Merge pull request #59 from javorszky/master
#48 (logout), register/login links, cookie time
2013-05-24 00:47:40 -07: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
Hannah Wolfe
4becf72228 Merge pull request #55 from ricardobeat/settings_api
Settings api
2013-05-23 14:44:39 -07: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
a49565c6c2 settings' API routes 2013-05-23 09:20:59 -03:00
Ricardo Tomasi
6f12870e70 Add task for API tests 2013-05-23 09:20:59 -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
Ricardo Tomasi
fefd0c930c better logging in dev mode 2013-05-23 09:20:58 -03:00
Hannah Wolfe
503e9fb391 Merge pull request #50 from javorszky/master
User authentication, #10
2013-05-22 12:37:16 -07: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
John O'Nolan
e331307e58 Updating dependencies - fixing borked Ghost version #. 2013-05-19 17:33:45 +01:00
John O'Nolan
eaecf4b252 Fixing some oopsies 2013-05-19 16:44:47 +01:00