ErisDS
077c602d61
Merge branch 'master' of github.com:javorszky/Ghost into javorszky-master
...
Conflicts:
app.js
2013-05-29 08:26:57 +01:00
Hannah Wolfe
4acf541fa6
Merge pull request #84 from jgable/frontEndMenu
...
Add ghostNav helper and filter for themes; closes #47
2013-05-28 17:37:55 -07:00
Gabor Javorszky
9a7e153549
#25 : admin navbar and filter
2013-05-29 01:10:39 +01:00
Jacob Gable
13ea1ddf5c
Merge branch 'master' of github.com:TryGhost/Ghost into frontEndMenu
2013-05-28 17:41:37 -05:00
Jacob Gable
e60fa79bae
Merging from upstream
2013-05-28 17:41:28 -05:00
Hannah Wolfe
148f7f3cd9
Merge pull request #60 from matthojo/Keyboard-Shortcuts
...
Add keyboard shortcuts
2013-05-28 15:08:55 -07:00
Matthew Harrison-Jones
c6734ebbf6
Moved shortcut initialisation over to interation
...
Currently using jQuery.each not _.each. Can be easily changed with
```
_.each(MarkdownShortcuts, function(short) {
shortcut.add(short.key, function () {
return editor.addMarkdown({style: short.style});
});
});
```
2013-05-28 14:23:01 +01:00
Matthew Harrison-Jones
d91c93f939
Converted from Jquery plugin to Codemirror function
2013-05-28 13:54:55 +01:00
Jacob Gable
3b6c3c6739
Merge branch 'master' of github.com:TryGhost/Ghost into frontEndMenu
2013-05-27 23:13:01 -05:00
Gabor Javorszky
8ffa03f775
Duplicate user, error handling, password in fixture
2013-05-27 23:04:09 -05:00
Hannah Wolfe
22eb953eb7
Updating package.json with grunt-cli package for travis
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
Hannah Wolfe
446da0c1e3
Removing unused bookshelf
2013-05-27 22:46:09 +01:00
Hannah Wolfe
5358331ad7
Merge pull request #85 from javorszky/master
...
User authentication / registration, fixture fix closes #82
2013-05-27 14:45:12 -07:00
Hannah Wolfe
5762f9e738
Updating package.json with grunt-cli package for travis
2013-05-27 22:19:26 +01:00
Gabor Javorszky
29bfcd3a3f
Duplicate user, error handling, password in fixture
2013-05-27 22:03:13 +01:00
Jacob Gable
47f49bbb4b
Add ghostNav helper and filter for themes; closes #47
2013-05-27 14:48:16 -05:00
Hannah Wolfe
f4368a2744
Merge pull request #76 from tgriesser/pagination
...
Pagination
2013-05-27 10:27:38 -07:00
Hannah Wolfe
ba08bb4ed2
Merge pull request #80 from javorszky/master
...
Replaced bcrypt with bcrypt-nodejs
2013-05-27 10:17: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
Hannah Wolfe
1e47f4e825
Merge pull request #75 from tgriesser/test-cleanup
...
Test cleanup - using promises properly
2013-05-27 05:48:25 -07:00
Tim Griesser
df23939554
done handler in final then, to ensure errors in last block are reported
2013-05-26 21:39:38 -04:00
Tim Griesser
d98ac4cf4a
Merge branch 'add-mocha' into test-cleanup
...
* add-mocha:
using grunt validate for npm test, fixing random jslint errors
2013-05-26 21:34:52 -04:00
Tim Griesser
000e4e6a00
beginning of pagination api
2013-05-26 20:49:38 -04:00
Tim Griesser
557d81f178
missing a done or two
2013-05-26 20:20:28 -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
Tim Griesser
3446fe7461
using promises correctly in tests
2013-05-26 19:53:44 -04:00
Tim Griesser
a3d2fb7aa9
adding mocha, getting npm test working
2013-05-26 19:41:05 -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
Matthew Harrison-Jones
27875b2849
Updated to fix JSLint issues
2013-05-26 14:01:00 +01: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
