Commit Graph

35663 Commits

Author SHA1 Message Date
Hannah Wolfe
12496918de Merge pull request #109 from tgriesser/client-post
Client Post
2013-06-04 06:53:15 -07:00
Tim Griesser
c4f6c99ca1 moving handlebars compile target, adding notification when saving post, using Ghost.View rather than modifying Backbone.View's prototype 2013-06-04 08:41:25 -04:00
Tim Griesser
524462e164 Merge branch 'master' into client-post
* master:
  Adding proper copyright info for Ghost Foundation
  Amending pagination test to have a longer timeout until #110 is done
  server half of #83, posts are draft by default, browse shows published by default
  Adding proper copyright info for Ghost Foundation
2013-06-04 08:03:51 -04:00
John O'Nolan
3dde7f7dca Adding proper copyright info for Ghost Foundation 2013-06-04 00:51:54 +02:00
ErisDS
278e0cf877 Amending pagination test to have a longer timeout until #110 is done 2013-06-03 10:08:31 +01:00
Hannah Wolfe
93a59ece44 Merge pull request #108 from tgriesser/server-post
"Post" model feature additions
2013-06-03 02:00:27 -07:00
Tim Griesser
e5ce70e175 Added models & collections for various pieces
Saving post as draft, or publishing
Added HBS parser for some client tmpls
Parsing paginated posts
Added grunt watch for hbs parsing on updates
2013-06-03 00:56:57 -04:00
Tim Griesser
30bd89587f server half of #83, posts are draft by default, browse shows published by default 2013-06-03 00:56:17 -04:00
John O'Nolan
1ae2d0e192 Adding proper copyright info for Ghost Foundation 2013-06-02 09:10:11 +02:00
Tim Griesser
b7064185d4 server half of #83, posts are draft by default, browse shows published by default 2013-06-01 15:42:11 -04:00
Tim Griesser
c55a96083a server side half of #83 2013-06-01 15:30:42 -04:00
Hannah Wolfe
d4f43c294c Merge pull request #105 from tgriesser/fat-models-2
Closes #81
2013-06-01 11:06:09 -07:00
Tim Griesser
983c171fb0 simplifying the model structure, again 2013-06-01 11:14:05 -04:00
Gabor Javorszky
f783adbe7f Issue #98, #4 Implemented countable.js 2013-06-01 12:52:20 +01:00
John O'Nolan
cf2d777ca4 Killing grid reference in main sass file 2013-06-01 11:20:38 +02:00
John O'Nolan
300d665e4a Killing grid. This isn't used currently and the only place it will likely ever be used is in the Dashboard, which will have its own specifically tailored grid. 2013-05-31 15:38:12 +02:00
John O'Nolan
e7307f7f63 Cleaning 2013-05-31 15:36:55 +02:00
ErisDS
185eee2a6b Implementing backbone for the blog / content view
closes #64 - adds a full example of using backbone on the frontend
remembered to squash this one!
2013-05-31 06:58:20 +01:00
Gabor Javorszky
33c28a88e8 filter on adminnavbar does nothing 2013-05-30 23:43:04 +01:00
Jacob Gable
a8bf3c962f Ghost.init()
- Modified jsonDataProvider to return promises for findAll and save
- Move the dataProvider initialization into the Ghost.init() function.
- Created basic unit test
2013-05-30 23:39:02 +01:00
Gabor Javorszky
ce5e757672 moved config into init function 2013-05-30 23:39:02 +01:00
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
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