OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into client-post

Browse Source 
* master:
  Adding proper copyright info for Ghost Foundation
  Amending pagination test to have a longer timeout until #110 is done
  server half of #83, posts are draft by default, browse shows published by default
  Adding proper copyright info for Ghost Foundation
This commit is contained in:
Tim Griesser 2013-06-04 08:03:51 -04:00
commit 524462e164
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE.txt
View File

@ -1,4 +1,4 @@
Copyright (c) 2013 Ghost
Copyright (c) 2013 The Ghost Foundation
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation

2
README.md
View File

@ -82,7 +82,7 @@ We also recommend [CodeKit](http://incident57.com/codekit/) (Paid/Mac) & [Scout]
## Copyright & License
Copyright (C) 2013 Ghost
Copyright (C) 2013 The Ghost Foundation - Released under the MIT Lincense.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

1
core/test/ghost/api_posts_spec.js
View File

@ -123,6 +123,7 @@
});
it('can fetch a paginated set, with various options', function (done) {
this.timeout(4000);
helpers.insertMorePosts().then(function () {