Commit Graph

34835 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
Hannah Wolfe
0a500bd104 Updating Casper reference to point to todays changes. 2013-06-16 20:49:47 +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
Hannah Wolfe
74dc64f1a3 Merge pull request #164 from cobbspur/helpers
Adding core helper function
2013-06-16 06:33:05 -07: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
Hannah Wolfe
1369789aec closes #150 - Updating Grunt
Grunt tasks are now hopefully a little bit less confusing
Have updated the readme to match
2013-06-15 19:33:52 +01: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
Hannah Wolfe
7b932b9986 Merge pull request #160 from jgable/fixDeployPaths
Fix relative paths for deployment
2013-06-15 10:53:48 -07: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
Hannah Wolfe
c59e12549e Merge pull request #158 from tgriesser/uuids
Adding uuid's for the posts, users, settings
2013-06-15 08:48:26 -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
ErisDS
057791893f Merge branch 'pr/155'
Merging Pull Request 155
2013-06-15 11:31:36 +01:00
Hannah Wolfe
4307b8c94d Changing Casper submodule to point to master 2013-06-15 11:23:29 +01: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
Hannah Wolfe
aedd9d7131 Merge pull request #156 from javorszky/iss112
Replaced config.blogData with settings
2013-06-15 01:37:12 -07: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
Hannah Wolfe
5d901e5238 Merge pull request #130 from jgable/buildTask
Nightly build task
2013-06-13 23:08:22 -07:00
Hannah Wolfe
37fd6f7a06 Re-adding the image fixtures which I forgot to readd when I was moving them around 2013-06-13 21:44:18 +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
John O'Nolan
ed8ccc2170 Merge pull request #143 from matthojo/Login-Screen
Fixes login box being off centred on small screens
2013-06-13 04:36:12 -07: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
John O'Nolan
f2e913ddfd Merge pull request #141 from matthojo/Login-Screen
Keep login centered, fixes #134
2013-06-11 22:48:28 -07: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
John O'Nolan
98b4b700ea Merge pull request #123 from cobbspur/uploadercss
HTML and CSS for image uploader, fixes #38.
2013-06-10 22:59:24 -07:00