Commit Graph

1448 Commits

Author SHA1 Message Date
Hannah Wolfe
9231174c3b Merge pull request #1256 from mduvall/contributing-fix-for-bourbon
State that Bourbon files are generated in CONTRIBUTING guide
2013-10-24 02:36:17 -07:00
Fabian Becker
f5d65d7ac4 Only show notifications when logged in.
fixes #943
2013-10-24 08:47:27 +00:00
William Dibbern
54a6cf79d7 Fix duplication of entries in infinite scroll
Fixes #1242

- Switched to render each new item as its added to the collection when
retrieving via scroll checks.
- Added check to remove all subviews whenever `render` is called on
`ContentList` as a preventative measure.
- Cached the jquery reference to the ordered list in `render`.
2013-10-24 01:19:09 -05:00
Matthew DuVall
a1c725d966 State that Bourbon files are generated in CONTRIBUTING guide
Fixes #1255.
- This says that the Bourbon directory is generated and does not
  ambiguiate with the installation of the bourbon gem
2013-10-23 18:53:28 -07:00
Matt DuVall
1580cccbf1 Explicitly add Ruby dependencies to project via Bundler
closes #1220
- This uses Bundler to install Ruby dependencies to handle explicit
  dependencies in provisioned environments
- The initial Gemfile contains SASS dependencies (sass and bourbon gems)
2013-10-23 18:16:16 -07:00
Fabian Becker
db0a182200 Add core/server.js to grunt watch 2013-10-23 20:58:28 +00:00
Fabian Becker
16f72ba865 Replace new-lines with spaces in excerpt helper.
fixes #531
2013-10-23 20:28:36 +00:00
Hannah Wolfe
fa4f66d5f4 Merge pull request #1202 from halfdan/1179-modal-styles 2013-10-23 21:21:58 +01:00
Fabian Becker
fc019fe675 Fixed style of modal in preview.
fixes #1179
2013-10-23 21:13:29 +01:00
Hannah Wolfe
5ba8959e83 Merge pull request #986 from sebgie/issue#952 2013-10-23 19:43:12 +01:00
Sebastian Gierlinger
c558cb7648 Add validation for importer
closes #952
- moved api.js to api/index.js
- added api/db.js for import and export functions
- moved /ghost/debug/db/export to GET /api/v0.1/db
- moved /ghost/debug/db/import to POST /api/v0.1/db
- removed /ghost/debug/db/reset
- added validation for import
- added constraints object to migration
2013-10-23 19:42:55 +01:00
Hannah Wolfe
6356ff9e94 Merge pull request #1248 from halfdan/bcryptjs
Replace nodejs-bcrypt with bcryptjs
2013-10-23 11:41:03 -07:00
Fabian Becker
1af17725fc Replace nodejs-bcrypt with bcryptjs
* https://github.com/shaneGirish/bcrypt-nodejs
* https://github.com/dcodeIO/bcrypt.js
2013-10-23 15:43:45 +00:00
Hannah Wolfe
80bbcf7205 Merge pull request #1239 from cobbspur/tagsprefix
adds prefix option to tag helper
2013-10-23 08:11:22 -07:00
Hannah Wolfe
40ba763f0f Merge pull request #1218 from halfdan/1212-themable-error-pages
Allow themes to provide custom error template.
2013-10-23 08:00:56 -07:00
Hannah Wolfe
90314e9745 Merge pull request #1241 from matthojo/Unicode-fix
Removed special character from SCSS
2013-10-23 07:32:46 -07:00
StevenMcD
2aded98a3c Issue/1007: Corrected the behaviour of the HOME and END keys on the CodeMirror editor by overriding their calls in the extraKeys config of the editor 2013-10-23 15:56:53 +02:00
Matthew Harrison-Jones
5c7dc88eda Removed special character from SCSS
Replaced it with the escaped unicode version (\21AA).
2013-10-23 11:38:57 +01:00
Hannah Wolfe
ce2c7b5341 Merge pull request #1236 from Tmeister/validate-negative-post-per-page 2013-10-22 23:23:24 +01:00
Enrique Chavez
3edd0e118d Validate negative numbers in the posts per page setting
issue #1236
- added validation to not allow number less than 0
2013-10-22 23:15:38 +01:00
Hannah Wolfe
a7a4420128 Merge pull request #1145 from b1nd/merge 2013-10-22 23:11:27 +01:00
b1nd
8f74eb0b83 Added server validation for location field 2013-10-22 23:00:12 +01:00
cobbspur
b85e5b6196 adds prefix option to tag helper
closes #607

 - added prefix attributetor tags helper
 - will add prefix only if tags are present
 - adds unit tests for prefix
2013-10-22 22:57:31 +01:00
Hannah Wolfe
3185078238 Merge pull request #1204 from Gotvitch/error-code
Keep the status code generate by connect in case of error.
2013-10-22 14:55:17 -07:00
Hannah Wolfe
b76eeef27f Merge pull request #1167 from manzoid/add-target-to-grunt-test-functional
add a `target` arg to `grunt test-functional`
2013-10-22 14:45:37 -07:00
Hannah Wolfe
01874b1fcf Merge pull request #1211 from matheusazzi/patch-1
Update package.json
2013-10-22 14:41:09 -07:00
Hannah Wolfe
2d1e28335c Merge pull request #1197 from halfdan/994-image-uploads
Show proper error message when image upload fails
2013-10-22 14:40:47 -07:00
Hannah Wolfe
a7838fa454 Merge pull request #1185 from commadelimited/1178-add-title-attribute-to-action-items 2013-10-22 22:31:45 +01:00
andy matthews
8743766071 Add tooltip text to icons in admin section
Closes #1178

* Add tooltip text to assorted icons within CMS
* Add tooltip for blog URL to Ghost logo
* Change 'Options' to 'Post Settings'

Change 'Options' to 'Post Settings'
2013-10-22 22:31:02 +01:00
Fabian Becker
27e66f75f3 Show proper error message when image upload fails
fixes #994
2013-10-22 21:08:26 +00:00
Hannah Wolfe
0d1fd56c0e Fixing client-side jslint exclude
- Gruntfile had an exclude for all of client/assets rather than client/assets/vendor
- Fixes missed jsLint errors
2013-10-22 22:06:22 +01:00
Hannah Wolfe
b319e5b800 Merge pull request #1232 from thgaskell/master
Undefined post data causing server to crash
2013-10-22 13:35:03 -07:00
Jacob Gable
34343e893d Store the Bookshelf instance on the Bookshelf module
- Assigns the ghostBookshelf instance to the Bookshelf.ghost property
2013-10-22 15:32:46 -05:00
Hannah Wolfe
173221606b Merge pull request #1193 from ZDroid/tag_way 2013-10-22 21:23:21 +01:00
Zlatan Vasović
fb8336100e Use less markup for links 2013-10-22 21:22:35 +01:00
Hannah Wolfe
fb97dd6e29 Merge pull request #1226 from halfdan/csrf-token
Fix CSRF propery deprecated warning
2013-10-22 13:18:27 -07:00
Hannah Wolfe
fc53bc8a15 Merge pull request #1152 from jgillich/status-code
Set correct HTTP status code on error
2013-10-22 13:05:22 -07:00
Hannah Wolfe
15a2eacaac Merge pull request #1141 from halfdan/246-helper-tests
Improved test coverage of theme helpers.
2013-10-22 12:45:07 -07:00
Hannah Wolfe
3e2ce74c90 Merge pull request #1121 from abe33/fix_user_image_border_in_settings
Fix style issue on user-image on Firefox and Opera
2013-10-22 12:40:07 -07:00
Hannah Wolfe
7ddc2fa287 Merge pull request #1119 from halfdan/featured-post-button
Posts can now be featured by clicking on the star icon
2013-10-22 12:38:43 -07:00
Hannah Wolfe
e2cf362395 Merge pull request #1117 from halfdan/featured-posts
Add featured class when post is featured
2013-10-22 12:38:33 -07:00
Hannah Wolfe
d64f2cde4c Merge pull request #1051 from nason/settingsResetOnImageUpload
Fixes #1017. Save all settings when the logo or cover is saved
2013-10-22 09:05:38 -07:00
Hannah Wolfe
5d169610ce Merge pull request #1133 from gotdibbs/Issue1124
Fixed intermittent test errors
2013-10-22 07:59:50 -07:00
Hannah Wolfe
4480d3bd02 Merge pull request #1088 from jacobian/postgres-fix
Fix #896 - work around errors in pagination under Postgresql.
2013-10-22 07:08:15 -07:00
Tony Gaskell
2809e405d5 fixed bug where an undefined variable could be dereferenced
which could cause the server to choke.
2013-10-22 03:20:09 -10:00
Fabian Becker
7099091c28 Fix CSRF deprecated warning 2013-10-22 07:33:30 +00:00
Fabian Becker
57bd929d2c Allow themes to provide custom error template.
fixes #1212, #1213
2013-10-21 19:12:22 +00:00
John O'Nolan
cf9b5d9441 Merge pull request #1199 from pborreli/typos
Fixed typos
2013-10-21 05:19:35 -07:00
John O'Nolan
614eb59bfb Merge pull request #1208 from jacques/master
Correct spelling of GitHub
2013-10-21 05:18:06 -07:00
Matheus Azzi
6555534608 Update package.json
Update grunt-contrib-watch
2013-10-21 08:44:10 -02:00