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