TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 12:53:13 +03:00
Code Issues Projects Releases Wiki Activity
1,131 Commits 250 Branches 1,686 Tags 400 MiB
2acb546028
Commit Graph

1131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Kaplan-Moss
2acb546028 Fix #896 - work around errors in pagination under Postgresql. 2013-10-15 11:09:08 -05:00
John O'Nolan
35347795a8 Merge pull request #1082 from bnchdrff/1081-update-contrib-instrs 
Change contrib instructions to reflect #579
 2013-10-15 06:16:08 -07:00
Benjamin Chodoroff
bc9e4fea1b fixes #1081: change contrib instructions to reflect #579 2013-10-15 12:17:27 +00:00
Hannah Wolfe
60c529b1e3 Merge pull request #1079 from matthojo/Grunt-Fix 
Included NProgress in Production Grunt concat
 2013-10-15 03:48:26 -07:00
Matthew Harrison-Jones
87269513d9 Included NProgress in Production Grunt concat 2013-10-15 11:18:57 +01:00
Hannah Wolfe
581d0c6e11 Switching Travis button from private to public 2013-10-15 10:29:06 +01:00
Hannah Wolfe
0bf5c99f08 Merge pull request #1067 from gotdibbs/Issue1064 
Clean up test database after tests
 2013-10-15 01:28:44 -07:00
William Dibbern
ac33cea0a1 Clean up test database after tests 
Fixes #1064

- Updated grunt config for unit and functional tests to remove the test
database after each is run.
- Cleaned up a couple of issues with the functional tests that may have
been causing travis builds to fail randomly, including: the start page
is now `about:blank` instead of whatever page the last test suite left
off at, added some checks in the logout tests to ensure they're truly
independent of the other test suites.
 2013-10-14 22:39:52 -05:00
Hannah Wolfe
18f78875ed Merge pull request #1050 from jgable/fixCssErrors 
Fix extra semi-colon in sass
 2013-10-14 14:53:25 -07:00
Hannah Wolfe
cef3175dbd Merge pull request #1046 from buddhamagnet/cache-selector-in-after-render 
Cache selector in afterRender function
 2013-10-14 13:47:23 -07:00
buddhamagnet
0662817cea Cache selector in afterRender function 
- cache selector in a variable to prevent recomputing it in the function.
 2013-10-14 20:56:20 +01:00
Hannah Wolfe
2a459b508a Merge pull request #1035 from pdehaan/patch-1 
Update Gruntfile.js
 2013-10-14 12:38:09 -07:00
Hannah Wolfe
3cb955fb44 Merge pull request #1041 from halfdan/markdown-modal 
Fix emphasize notation in Markdown modal.
 2013-10-14 12:20:01 -07:00
Hannah Wolfe
e05d5e5fc1 Merge pull request #1026 from jenius/master 
Remove unneeded info from /user api response
 2013-10-14 12:19:28 -07:00
Jeff Escalante
44973ba255 remove unneeded info from user api response 2013-10-14 15:07:52 -04:00
Fabian Becker
72f7404d2f Fix emphasize notation in Markdown modal. 
fixes #1008
 2013-10-14 18:12:55 +00:00
Peter deHaan
f4dabe07b5 Update Gruntfile.js 
Removing double 'path' require()
 2013-10-14 10:49:13 -07:00
Jacob Gable
c153a3ca01 Fix extra semi-colon in sass 
Related to #1033 but needs TryGhost/Casper#32 to close

- Remove extra semi-colon
 2013-10-14 12:45:46 -05:00
Hannah Wolfe
bb3b153d1c Merge pull request #1029 from buddhamagnet/add-vim-cruft-to-gitignore 
Add vim cruft to gitignore
 2013-10-14 08:50:00 -07:00
buddhamagnet
dc2fb38b3e add vim cruft to gitignore 2013-10-14 16:47:54 +01:00
Hannah Wolfe
1d1674547f Troubleshooting in Contributing.md 2013-10-14 15:57:33 +01:00
Hannah Wolfe
25bc2e31e8 Merge branch 'master' of github.com:/TryGhost/Ghost 2013-10-14 15:34:18 +01:00
Hannah Wolfe
b97da4d4c9 Cleaning up Contributing.md 2013-10-14 15:33:50 +01:00
Hannah Wolfe
e000207a49 Contributing update 2013-10-14 15:10:13 +01:00
Hannah Wolfe
8ab4552ca0 Merge pull request #1011 from buddhamagnet/amend-readmes 
Added full stops to READMEs
 2013-10-14 06:41:12 -07:00
buddhamagnet
ec00b71b09 added full stops to READMEs 2013-10-14 13:56:09 +01:00
Hannah Wolfe
c76a2410aa Merge pull request #1010 from moritzh/master 
Update README.md
 2013-10-14 05:28:55 -07:00
moritz haarmann
10fa96a3d1 Update README.md 
Small typo in Readme fixed
 2013-10-14 14:24:33 +02:00
Hannah Wolfe
119b0ea430 Merge branch '0.3.2-wip' 
Conflicts:
	core/client/assets/lib/uploader.js
 2013-10-11 20:56:15 +01:00
Hannah Wolfe
b4e04b3650 Fix for image uploads 
- express 3.4.0 uses connect 2.9.0 which had a sizable change to how multipart woks
- this change resulting in req.files.uploadimage.type going away
 2013-10-11 20:26:09 +01:00
Hannah Wolfe
b544ee7ed6 Revert "Updated to latest version of express-hbs" 
This reverts commit d169bba3f8.

Conflicts:
	package.json
 2013-10-11 20:14:58 +01:00
Hannah Wolfe
f30e356e7c Revert "Updated to latest version of express" 
This reverts commit c95d469eb3.

Conflicts:
	package.json
 2013-10-11 20:13:44 +01:00
Hannah Wolfe
b4d5918fac Version bump for 0.3.2 
- added optional mysql dependency
- removed .afignore
- updates to .gitignore to ignore any additional themes or plugins
 2013-10-11 18:21:14 +01:00
Hannah Wolfe
d47b19b491 Added grunt release task 
closes #941

Conflicts:
	Gruntfile.js
 2013-10-11 18:19:03 +01:00
Hannah Wolfe
4c89422b0d Added SECURITY.md file 
closes #989
 2013-10-11 18:17:37 +01:00
Hannah Wolfe
e613d88167 Merge pull request #997 from cobbspur/uploadrefactor 2013-10-11 18:15:45 +01:00
cobbspur
c52a10cd1a fixed image upload url synchronicity and url removed on cancel 
closes #988, closes #956, closes #975

- fixed multiple ids and refactored triggers
- persistence requirement overridden
- trash can now removes url in editor
- if empty url is saved http:// is inserted and dropzone initialized

Conflicts:
	core/client/assets/lib/uploader.js
 2013-10-11 18:15:17 +01:00
Hannah Wolfe
0bb5e8702a Merge pull request #980 from jamesbloomer/lockdown-assets-rebase 2013-10-11 18:06:11 +01:00
jamesbloomer
9d114c7fa6 Lock down theme static directory to not serve templates, markdown and text files. 
closes #942
- insert custom middleware to check for blacklisted files
- redirect to express.static if file accepted
- if not valid return next() to do nothing
- currently black listing .hbs, .txt, .md and .json
- debatable which is best, black list or white list, either one will probably need tweaks but erred on side of letting
a theme serve unknown types
 2013-10-11 18:05:31 +01:00
Hannah Wolfe
6db7e6d96e Merge pull request #1000 from sebgie/issue#872 2013-10-11 13:19:12 +01:00
Sebastian Gierlinger
b040ea3365 Change from address 
closes #872
- changed from address to use config.mail.fromaddress
- changed from address to default to settings.email
 2013-10-11 12:49:33 +01:00
Hannah Wolfe
c732cd2ccb Adding xss unit test 
issue #938
 2013-10-10 16:43:25 +01:00
Hannah Wolfe
9466a9753b Merge branch '0.3.2-wip' 
Conflicts:
	core/test/unit/api_posts_spec.js
 2013-10-10 16:37:35 +01:00
Hannah Wolfe
a37d487ffd Merge pull request #992 from pmgarman/spacelys-sprockets-n-sockets 2013-10-10 16:19:42 +01:00
Hannah Wolfe
31e2737cfd Update config validation to allow for socket only 
issue #887
 2013-10-10 16:13:02 +01:00
Patrick Garman
97f592aa41 Allow Ghost to run using sockets 
Closes #887
- Adds getSocket function > Returns the socket location if sockets are enabled or false
- Adds startGhost function > Callback for server.listen
 2013-10-10 16:12:28 +01:00
Hannah Wolfe
03ee256da6 Merge pull request #922 from matthojo/SASS-Compress 2013-10-10 15:40:27 +01:00
Matthew Harrison-Jones
5daa46276c SCSS is now compressed on build 2013-10-10 15:27:07 +01:00
Hannah Wolfe
54f8a04779 Merge pull request #996 from ErisDS/0.3.2-tagfixes 
Improving tag handling in post_class and body_class
 2013-10-10 07:05:15 -07:00
Hannah Wolfe
7b28056849 Merge pull request #995 from ErisDS/xss 
XSS
 2013-10-10 07:04:50 -07:00