TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-16 04:08:34 +03:00
Code Issues Projects Releases Wiki Activity
319 Commits 253 Branches 1,686 Tags 364 MiB
b37f542448
Commit Graph

206 Commits

Author SHA1 Message Date
Hannah Wolfe
f58c8eb6c3 Merge pull request #163 from jgable/exportData 
Data import and export
 2013-06-17 01:19:48 -07:00
Hannah Wolfe
8d8a6e0949 Wiring up the content settings panel to save blog description 
Also cleaned up a bit of broken markup
 2013-06-16 22:47:10 +01:00
Hannah Wolfe
0d5b6e8915 Added consistent error handling throughout the models 2013-06-16 22:36:28 +01:00
Matthew Harrison-Jones
14aabec80c Notifications can now be dismissed via click / tap 2013-06-16 19:45:16 +01:00
Hannah Wolfe
0f0769ab2b issue #157 - init ordering and error handling 
reordering init so that settings are always loaded after the db is initialised
adding error handling to promises
 2013-06-16 17:14:01 +01:00
Hannah Wolfe
382da5daf0 Adding a test for published at. 2013-06-16 16:09:54 +01:00
cobbspur
b9e1ddcb2e Adds handlerbars helper 'foreach' 
Function allows you to iterate through an array or object  in handlebars
Sets Key Values for @first/ @last entry and @odd/@even to true/false
 2013-06-16 14:12:28 +01:00
ErisDS
17c8c02eae closes #117 - published order 
Fixes the knex query so that posts are correctly returned in the order of published_at, desc
 2013-06-16 12:21:49 +01:00
Hannah Wolfe
49999a7f15 Merge pull request #162 from javorszky/iss132 
/register/ => /signup/
 2013-06-16 01:45:57 -07:00
John O'Nolan
b278ed6aa7 Merge pull request #152 from matthojo/Users-Settings 
Refactored users settings page - see #147
 2013-06-16 01:33:51 -07:00
Hannah Wolfe
49f6cc92d4 Merge pull request #161 from tgriesser/published_at 
Setting published_at when post changes to published status.
 2013-06-16 01:33:24 -07:00
Tim Griesser
fad7087cd1 Setting published_at when post changes to published status 2013-06-15 19:24:27 -04:00
Jacob Gable
0c4ccc284b Data import and export 2013-06-15 20:52:32 +00:00
Gabor Javorszky
78cbaf0387 /register/ => /signup/ 
Fixes issue #132. Also added `js-login-container` class to the
signup box, as it wasn't faded in due to javascript not picking
up the element.
 2013-06-15 19:16:15 +01:00
Jacob Gable
a63690a471 Fix relative paths for deployment 
In order to run with forever / supervisorctl, the relative paths need to
be converted to full ones based on the __dirname.
 2013-06-15 10:54:49 -05:00
Hannah Wolfe
b816225dca Merge pull request #159 from jgable/fixRequireTree 
Error check and default set for require-tree.
 2013-06-15 08:48:51 -07:00
Jacob Gable
b4b8be2bb8 Error check and default set for require-tree. 2013-06-15 09:22:50 -05:00
Tim Griesser
a5b9274bb5 adding uuid's for the posts, users, settings 2013-06-15 10:16:20 -04:00
Gabor Javorszky
b0b11573f6 Restricting Admin user creation 
Solves #138.
* Removed user and user_roles from fixture
* Restricted user creation to one user. That user is id 1, is admin
* Changed tests so they accommodate for this fact
* Can not create new user (fails on test, flashes on signup)
 2013-06-15 10:10:26 +01:00
Gabor Javorszky
81d317a122 Replaced config.blogData with settings 
Solves #112
* Removed config.blogData
* Changed Ghost.init() to accommodate new settings bits
* (data was already in the fixtures)
 2013-06-15 00:39:27 +01:00
Matthew Harrison-Jones
0d75b737b8 Refactored users settings page 
Improved standards of CSS and also refactored HTML markup. Search bar
also is implemented, with a prototype animation for displaying input
field.
 2013-06-14 14:01:33 +01:00
John O'Nolan
1fab45669e Adjusting form styles and animations for checkboxes. Fixes #7 2013-06-13 14:31:16 +02:00
John O'Nolan
43db602b41 Merge pull request #145 from matthojo/Checkbox-Styling 
Removed the need for iCheck CSS dependency. See #7
 2013-06-13 05:04:47 -07:00
John O'Nolan
5215387e07 Minor tweaks to login form animations and styles - fixes #134 2013-06-13 13:58:37 +02:00
Matthew Harrison-Jones
8d66cbd6e8 Removed the need for iCheck CSS dependency. 
Made all iCheck images into CSS and removed the iCheck CSS stylesheet.
 2013-06-13 12:54:57 +01:00
Matthew Harrison-Jones
de09e7d19c Fixes login box being off centred on small screens 
Accounted for top offset to keep login container centred. Login container fades in on load.
Tested on a variety of window sizes and appears to be centred on all of them (measured it to make sure).
 2013-06-13 09:38:40 +01:00
Matthew Harrison-Jones
94c8c94ad1 Fixes login staying centred 
Now included in `$(window).resize();` to update location of Login
container. The login is now more of a visually 'true' centre, with the offset being more towards the top.
Centring on resize, wasn't in original commit to remove one extra event listener.
 2013-06-11 18:56:25 +01:00
John O'Nolan
2be5ce72ae Merge pull request #140 from matthojo/Login-Screen 
Vertically center login form, fixes #134
 2013-06-11 09:56:47 -07:00
Matthew Harrison-Jones
fbd54942b5 Center Login container 2013-06-11 17:42:56 +01:00
John O'Nolan
bdd29fafaf Appearance => Theme 2013-06-11 17:57:02 +02:00
John O'Nolan
1267f91935 Refactor + Restyle login/register screens. See #134 2013-06-11 16:45:42 +02:00
John O'Nolan
7e1bd2922e Reducing overzealous sass indenting for performance. 2013-06-11 15:32:56 +02:00
John O'Nolan
501e8695f2 Correcting login screen markup/styling issues, fixes #133 2013-06-11 15:01:02 +02:00
Hannah Wolfe
0a0039820d Merge pull request #127 from matthojo/Keyboard-Shortcuts 
Added Keyboard Shortcuts to change Post Status and Save.
 2013-06-11 05:24:36 -07:00
Hannah Wolfe
320bb311bc Merge pull request #131 from javorszky/iss82-2 
Registration no longer hangs on duplicate emails
 2013-06-11 04:41:22 -07:00
Hannah Wolfe
06b5ab86fb Merge branch 'pr119-merged' 
Conflicts:
	core/admin/views/settings.hbs
 2013-06-11 11:56:01 +01:00
Hannah Wolfe
493cf6ea7f Merge branch 'pr/126' 2013-06-11 10:30:00 +01:00
Matthew Harrison-Jones
44575cdb25 Added Keyboard Shortcuts to change Post Status and Save. 
This also includes the updated Header tag shortcuts.
Also fixes keyboard shortcuts being broken due to `this` not being passed into shortcut each function.
 2013-06-10 22:52:24 +01:00
Gabor Javorszky
e0caddeee7 Registration no longer hangs on duplicate emails 
There was a return missing. This closes #82 again.
 2013-06-10 21:26:20 +01:00
cobbspur
40d8b0321c implements #38 html and scss for uploader 
- Fixed broken html
- Added file input to html
- Styling for hidden file input button
- Styling for progress bar and loading
- Added javascript classes for hooking file upload
- Added loading image (cat)
 2013-06-10 20:07:34 +01:00
John O'Nolan
4a630af54a Removing box-shadow() mixin references that are deprecated in Bourbon, missed in previous commit. See #44 2013-06-10 09:51:49 +02:00
Ricardo Tomasi
cc6bb94e74 remove default .active tab from template. fixes #125 2013-06-09 19:56:47 -03:00
Hannah Wolfe
b3775feba0 Merge branch 'pr/119' 
Conflicts:
	core/admin/assets/js/router.js
	core/admin/views/default.hbs
	core/admin/views/settings.hbs
	core/shared/data/fixtures/001.js
 2013-06-09 21:41:07 +01:00
Gabor Javorszky
e271c6402f Directory scanning on contents/themes and plugins 
This implements #106.
* Added require-tree which is based off of @ricardobeat's module. Fully async.
* I've moved active theme and active directory to settings from config as well.
* Modified settings.hbs and settings.js to display the raw json under Settings/Appearance
 2013-06-09 20:17:54 +01:00
Hannah Wolfe
1df9b6e90a Merge pull request #121 from jgable/filterPriority 
Filter priorities
 2013-06-09 12:12:04 -07:00
Hannah Wolfe
d3ac1c7fc7 Merge pull request #120 from jgable/permissable 
Implement a permissable interface on models
 2013-06-09 12:00:03 -07:00
Jacob Gable
55d8ff75b4 Filter priorities 
Add the ability to specify a priority level when registering filters.
Also change doFilter to execute filters in priority order.

Closes #86
 2013-06-09 11:16:25 -05:00
Hannah Wolfe
c733a1ac62 Merge pull request #114 from matthojo/Backbone-Widgets 
Initial Backbone Widgets
 2013-06-09 06:24:08 -07:00
Matthew Harrison-Jones
2e44a1f845 Converted static Widgets to Backbone. 
Moved static HTML Widgets to Backbone.

Might need to move Widget data else where to keep it clean.
Will need to also implement API for future use.
 2013-06-09 10:56:10 +01:00
Jacob Gable
1effc4e772 Implement a permissable interface on models 
Added checks to the canThis process for a `permissable()` function
that would allow Models to override the permissions process.
 2013-06-08 18:39:24 -05:00
Ricardo Tomasi
e2b3c40a34 Migrate settings page to Backbone 2013-06-08 19:36:54 -03:00
Ricardo Tomasi
c82e5976cc Changes to Settings Model 
- add email default setting to fixture
- make settings a single model
- create UNIQUE index on setting keys
 2013-06-08 19:24:21 -03:00
Ricardo Tomasi
dc714611a9 move Ghost.View out of init, refactor 2013-06-07 23:16:28 -03:00
Hannah Wolfe
aa659d29b6 JSLint updates - function spacing consistency 
- updating grunt-jslint to the latest version
- fixing up function spacing
 2013-06-06 21:38:12 +01:00
Hannah Wolfe
60d90967e1 issue 101 - updating the data model 
Added & removed many properties as required & fixed tests
Updated & also cleaned up the fixtures, inc images
Added order by published to the findPage query
 2013-06-06 21:36:17 +01:00
Jacob Gable
e6f7c706cb Permissions / ACL 
- Created Role model
- Created Permission model
- Linked Users->Roles with a belongsToMany relationship
- Linked Permissions to Users and Roles with a belongsToMany relationship
- Created permissions helper with functions for initializing and
  checking permissions (canThis)
- Unit tests for lots of things
 2013-06-06 08:15:10 +01:00
Matthew Harrison-Jones
c4f19af62f Dashboard widget functionality 
Intial widget layout, with packery for drag and drop support.
Adds ability to save the order of widgets in localstorage
 2013-06-06 07:26:25 +01: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
ErisDS
278e0cf877 Amending pagination test to have a longer timeout until #110 is done 2013-06-03 10:08:31 +01: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
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
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
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
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
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