Skip to content

Commit

Permalink
Merge branch 'master' into ember
Browse files Browse the repository at this point in the history 
Conflicts:
	bower.json
	core/client/views/editor.js
  • Loading branch information
@ErisDS
ErisDS committed Mar 16, 2014
2 parents 26cda45 + a65d5bb commit 79a333b
Show file tree
Hide file tree
Showing 20 changed files with 641 additions and 336 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ results
npm-debug.log
node_modules
bower_components

.bowerrc
.idea/*
*.iml
projectFilesBackup
Expand Down
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ var path = require('path'),
files: [
// Theme CSS
'content/themes/casper/css/*.css',
// Ghost UI CSS
'bower_components/ghost-ui/dist/css/*.css',
// Theme JS
'content/themes/casper/js/*.js',
// Admin JS
Expand Down Expand Up @@ -1021,4 +1023,4 @@ var path = require('path'),
grunt.registerTask('default', 'Build JS & templates for development', ['update_submodules', 'handlebars', 'concat', 'copy:dev', 'emberBuild']);
};

module.exports = configureGrunt;
module.exports = configureGrunt;
4 changes: 2 additions & 2 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014 Ghost Foundation - Released under The MIT License.
Copyright (c) 2013-2014 Ghost Foundation - Released under The MIT License.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand All @@ -19,4 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ Constructed with the following guidelines:

## Copyright & License

Copyright (C) 2014 Ghost Foundation - Released under the [MIT license](LICENSE).
Copyright (c) 2013-2014 Ghost Foundation - Released under the [MIT license](LICENSE).
3 changes: 1 addition & 2 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
"ember": "~1.4.0",
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#9805033c178e7f857f801359664adb599444b430",
"fastclick": "1.0.0",
"ghost-ui": "0.1.0",
"ghost-ui": "0.1.2",
"handlebars": "~1.1.2",
"ic-ajax": "1.0.1",
"iCheck": "1.0.1",
"jquery": "1.11.0",
"jquery-file-upload": "9.5.6",
"jquery-hammerjs": "1.0.1",
Expand Down
167 changes: 61 additions & 106 deletions core/clientold/tpl/modals/markdown.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,69 @@
<section class="markdown-help-container">
<table class="modal-markdown-help-table">
<thead>
<tr>
<th>Result</th>
<th>Markdown</th>
<th>Shortcut</th>
</tr>
<tr>
<th>Result</th>
<th>Markdown</th>
<th>Shortcut</th>
</tr>
</thead>
<tbody>
<tr>
<td><strong>Bold</strong></td>
<td>**text**</td>
<td>Ctrl / Cmd + B</td>
</tr>
<tr>
<td><em>Emphasize</em></td>
<td>*text*</td>
<td>Ctrl / Cmd + I</td>
</tr>
<tr>
<td><code>Inline Code</code></td>
<td>`code`</td>
<td>Cmd + K / Ctrl + Shift + K</td>
</tr>
<tr>
<td>Strike-through</td>
<td>~~text~~</td>
<td>Ctrl + Alt + U</td>
</tr>
<tr>
<td><a href="#">Link</a></td>
<td>[title](http://)</td>
<td>Ctrl + Shift + L</td>
</tr>
<tr>
<td>Image</td>
<td>![alt](http://)</td>
<td>Ctrl + Shift + I</td>
</tr>
<tr>
<td>List</td>
<td>* item</td>
<td>Ctrl + L</td>
</tr>
<tr>
<td>Blockquote</td>
<td>> quote</td>
<td>Ctrl + Q</td>
</tr>
<tr>
<td>H1</td>
<td># Heading</td>
<td>Ctrl + Alt + 1</td>
</tr>
<tr>
<td>H2</td>
<td>## Heading</td>
<td>Ctrl + Alt + 2</td>
</tr>
<tr>
<td>H3</td>
<td>### Heading</td>
<td>Ctrl + Alt + 3</td>
</tr>
<tr>
<td>H4</td>
<td>#### Heading</td>
<td>Ctrl + Alt + 4</td>
</tr>
<tr>
<td>H5</td>
<td>##### Heading</td>
<td>Ctrl + Alt + 5</td>
</tr>
<tr>
<td>H6</td>
<td>###### Heading</td>
<td>Ctrl + Alt + 6</td>
</tr>
<tr>
<td>Select Word</td>
<td></td>
<td>Ctrl + Alt + W</td>
</tr>
<tr>
<td>New Paragraph</td>
<td></td>
<td>Ctrl / Cmd + Enter</td>
</tr>
<tr>
<td>Uppercase</td>
<td></td>
<td>Ctrl + U</td>
</tr>
<tr>
<td>Lowercase</td>
<td></td>
<td>Ctrl + Shift + U</td>
</tr>
<tr>
<td>Titlecase</td>
<td></td>
<td>Ctrl + Alt + Shift + U</td>
</tr>
<tr>
<td>Insert Current Date</td>
<td></td>
<td>Ctrl + Shift + 1</td>
</tr>
<tr>
<td><strong>Bold</strong></td>
<td>**text**</td>
<td>Ctrl / Cmd + B</td>
</tr>
<tr>
<td><em>Emphasize</em></td>
<td>*text*</td>
<td>Ctrl / Cmd + I</td>
</tr>
<tr>
<td>Strike-through</td>
<td>~~text~~</td>
<td>Ctrl + Alt + U</td>
</tr>
<tr>
<td><a href="#">Link</a></td>
<td>[title](http://)</td>
<td>Ctrl + Shift + L</td>
</tr>
<tr>
<td>Image</td>
<td>![alt](http://)</td>
<td>Ctrl + Shift + I</td>
</tr>
<tr>
<td>List</td>
<td>* item</td>
<td>Ctrl + L</td>
</tr>
<tr>
<td>Blockquote</td>
<td>> quote</td>
<td>Ctrl + Q</td>
</tr>
<tr>
<td>H1</td>
<td># Heading</td>
<td>Ctrl + Alt + 1</td>
</tr>
<tr>
<td>H2</td>
<td>## Heading</td>
<td>Ctrl + Alt + 2</td>
</tr>
<tr>
<td>H3</td>
<td>### Heading</td>
<td>Ctrl + Alt + 3</td>
</tr>
<tr>
<td><code>Inline Code</code></td>
<td>`code`</td>
<td>Cmd + K / Ctrl + Shift + K</td>
</tr>
</tbody>
</table>
For further Markdown syntax reference: <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Documentation</a>
</section>
</section>
2 changes: 0 additions & 2 deletions core/clientold/views/editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@
model: {
options: {
close: true,
type: "info",
style: ["wide"],
animation: 'fade'
},
Expand Down Expand Up @@ -531,7 +530,6 @@
model: {
options: {
close: true,
type: "info",
style: ["wide"],
animation: 'fade'
},
Expand Down
22 changes: 18 additions & 4 deletions core/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,31 @@
// Orchestrates the loading of Ghost
// When run from command line.

var bootstrap = require('./bootstrap'),
errors = require('./server/errorHandling');
var when = require('when'),
bootstrap = require('./bootstrap');

process.env.NODE_ENV = process.env.NODE_ENV || 'development';

function startGhost(options) {
// When we no longer need to require('./server')
// in a callback this extra deferred object
// won't be necessary, we'll just be able to return
// the server object directly.
var deferred = when.defer();

options = options || {};

bootstrap(options.config).then(function () {
var ghost = require('./server');
ghost(options.app);
}).otherwise(errors.logAndThrowError);
return ghost(options.app).then(deferred.resolve).otherwise(function (e) {
// We don't return the rejected promise to stop
// the propogation of the rejection and just
// allow the user to manage what to do.
deferred.reject(e);
});
});

return deferred.promise;
}

module.exports = startGhost;
9 changes: 9 additions & 0 deletions core/server/config/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ var path = require('path'),
appRoot = path.resolve(__dirname, '../../../'),
corePath = path.resolve(appRoot, 'core/');

// Are we using sockets? Custom socket or the default?
function getSocket() {
if (ghostConfig.server.hasOwnProperty('socket')) {
return _.isString(ghostConfig.server.socket) ? ghostConfig.server.socket : path.join(ghostConfig.paths.contentPath, process.env.NODE_ENV + '.socket');
}
return false;
}

function updateConfig(config) {
var localPath,
contentPath,
Expand Down Expand Up @@ -110,5 +118,6 @@ function config() {
module.exports = config;
module.exports.init = initConfig;
module.exports.theme = theme;
module.exports.getSocket = getSocket;
module.exports.urlFor = configUrl.urlFor;
module.exports.urlForPost = configUrl.urlForPost;
Loading

0 comments on commit 79a333b

Please sign in to comment.