TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity
32,541 Commits 227 Branches 1,677 Tags 368 MiB
63d216c321
Commit Graph

32541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ErisDS
611e6a49ef Merge branch 'fat-models' of github.com:tgriesser/Ghost into tgriesser-fat-models 
Conflicts:
	core/admin/assets/sass/layouts/dashboard.scss
	core/admin/views/dashboard.hbs
	core/shared/models/dataProvider.bookshelf.js
 2013-05-30 22:23:18 +01:00
John O'Nolan
a89dc1d123 Merge pull request #95 from matthojo/New-Widgets 
Initial new Dashboard widgets - see #65
 2013-05-30 04:15:10 -07:00
Matthew Harrison-Jones
826d20a902 New Widgets 2013-05-30 12:10:15 +01:00
John O'Nolan
c0f6f03f3b Adding new icons: reply, repost, weather (sun/partial/cloud/rain/snow) for Dashboard. See #65 2013-05-30 11:39:14 +02:00
Tim Griesser
7cbbb3af4e lint fixes & bcrypt-nodejs 2013-05-29 21:58:59 -04:00
Tim Griesser
cf9c2462fa lint fixes 2013-05-29 18:28:24 -04:00
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
ErisDS
879f0983b2 Merge branch 'master' of github.com:JohnONolan/Ghost into JohnONolan-master 2013-05-29 22:06:43 +01:00
Hannah Wolfe
4571d05c76 Merge pull request #96 from jgable/fixTravisSqlLiteErrors 
Fix Travis Errors
 2013-05-29 12:12:05 -07: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
e57a04728b Remove Compass config 2013-05-29 17:04:48 +02:00
John O'Nolan
511df8fde4 Revert version to 0.1.0 to reflect accurate version in package.json - removed changelog (Github is our changelog). /cc @javorszky 2013-05-29 16:35:54 +02: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
John O'Nolan
5c475f9040 Updating contributors link to give more obvious credit to people who are writing code for Ghost. Fixing ugly linebreak with love. 2013-05-29 12:15:46 +02: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
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
Tim Griesser
d2ca06c006 merging master 2013-05-27 13:31:29 -04: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
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