Hannah Wolfe
3eae0a3939
Merge pull request #1103 from b1nd/merge
...
Removed unused variables and updated commenting
2013-10-16 03:31:57 -07:00
Hannah Wolfe
840aa363b9
Merge pull request #1102 from vineet-sinha/patch-2
...
Instructions to start the server.
2013-10-16 03:26:59 -07:00
Hannah Wolfe
7419e05b3a
Merge pull request #1092 from halfdan/uc-helper
...
Added new helper to escape URIs called 'encode'
2013-10-16 02:23:13 -07:00
Fabian Becker
788987d04a
Added new helper to escape URIs called 'encode'
...
fixes #1089
2013-10-16 09:19:26 +00:00
John O'Nolan
931897ed75
Updated package.json with Ghost details
2013-10-16 11:09:20 +02:00
John O'Nolan
a76a702e6e
Merge pull request #1098 from hansondr/floatingheader
...
tweaked .floatingheader background for non-webkit browsers
2013-10-16 01:18:31 -07:00
Hannah Wolfe
a5c35d451a
Merge pull request #1107 from karolisdzeja/pub-date-bug-fix
...
Fix notification bug
2013-10-16 00:37:48 -07:00
Karolis Dzeja
88d0303093
Fix notification bug
...
The date stored in the model is in a different format and needs to be converted before being checked. Otherwise, any blur event will trigger the notification that the date has been changed, even if the date is the same.
2013-10-16 00:30:25 -05:00
b1nd
c61806c1c8
Removed unused variables and updated commenting
2013-10-16 11:32:44 +11:00
Vineet Sinha
7e9f3957fa
Instructions to start the server.
2013-10-15 18:43:47 -04:00
Hannah Wolfe
5f3f0d013b
Merge pull request #1099 from sjama/license
...
renamed LICENSE.txt to LICENSE
2013-10-15 14:44:06 -07:00
sjama
609f009c9f
renamed LICENSE.txt to LICENSE
2013-10-15 22:08:11 +01:00
Daniel Hanson
0bcc111025
tweaked .floatingheader background for non-webkit browsers
2013-10-15 13:29:56 -06:00
Hannah Wolfe
930309363d
Merge pull request #1020 from padhg/omit-uri-scheme
...
Allow omission of URI Scheme in config.js url
2013-10-15 12:26:18 -07:00
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
Derek Myers
aae4ce50f2
Changed git submodule to use git instead of ssh
2013-10-14 11:26:38 -04:00
Hannah Wolfe
1d1674547f
Troubleshooting in Contributing.md
2013-10-14 15:57:33 +01:00
Ryan Powell
dc1cf3b509
changes to support URI's without a scheme in config.js.
...
also removed "http:" from google fonts link to prevent a mixed content warning.
2013-10-14 10:42:08 -04: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