TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-21 09:52:06 +03:00
Code Issues Projects Releases Wiki Activity
10,462 Commits 250 Branches 1,686 Tags 378 MiB
71a35092b0
Commit Graph

7527 Commits

Author SHA1 Message Date
Tim Griesser
091790a525 merging with master 2013-05-29 18:26:10 -04:00
ErisDS
4083592724 Merge branch 'jquery' of github.com:JohnONolan/Ghost into JohnONolan-jquery 2013-05-29 22:16:02 +01:00
Jacob Gable
d81d408eab Fix Travis Errors 
- affects #91
- Move dataProvider initialization outside constructor
- Add travis sqlite config that enables debug
- Add grunt-cli installation to travis before_script
 2013-05-29 13:32:38 -05:00
John O'Nolan
74ed10eee2 Bumping jQuery to 2.0 as we're not supporting <IE9 anyway. See also: #93 2013-05-29 17:16:51 +02:00
Matthew Harrison-Jones
2fc0a6a02e Initial Dashboard UI conversion 2013-05-29 11:05:06 -04:00
John O'Nolan
1de39b21ce Merge pull request #78 from matthojo/Dashboard-Widgets 
Initial Dashboard UI conversion, see #65
 2013-05-29 05:10:06 -07:00
Matthew Harrison-Jones
92de86bff3 Initial Dashboard UI conversion 2013-05-29 13:04:14 +01:00
ErisDS
077c602d61 Merge branch 'master' of github.com:javorszky/Ghost into javorszky-master 
Conflicts:
	app.js
 2013-05-29 08:26:57 +01: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
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
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
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
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
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
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
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
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
bde60031ac Add keyboard shortcuts 2013-05-24 11:09:20 +01: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