Commit Graph

777 Commits

Author SHA1 Message Date
Adam Howard
3823d10c35 Restructure default-settings.json and add validations to important settings. 2013-09-14 14:29:27 +01:00
Hannah Wolfe
7d3eb512f6 Unit tests require config file to be present. 2013-09-13 08:24:28 +01:00
Hannah Wolfe
8cea12e728 Merge branch 'master' into stable-db-version 2013-09-12 22:08:23 +01:00
Hannah Wolfe
762dcb2334 Adding missing file 2013-09-12 22:04:28 +01:00
Hannah Wolfe
c9556abd31 Ensuring content/images is present
- removed the two old core/content READMEs which serve little purpose
2013-09-12 22:01:59 +01:00
Hannah Wolfe
147951c59c Reverting some markdown fixes
issue #644

- this caused more trouble than it was worth, will revisit
2013-09-12 21:49:29 +01:00
Hannah Wolfe
eb15a37850 Gruntfile cleanup 2013-09-12 21:03:01 +01:00
John O'Nolan
60635991db Added option for large buttons 2013-09-12 18:34:21 +02:00
Hannah Wolfe
aa60a6386f Moving default location of the Database
closes #579

- adding a readme to the content/data folder to make sure it is always created
- also fixes a rebasing error
2013-09-12 15:51:55 +01:00
Hannah Wolfe
53a55fd46f Removing config.js
closes #376

- was already added to .gitignore
2013-09-12 15:44:46 +01:00
Hannah Wolfe
8c9bcf661f Merge pull request #707 from sebgie/stable-db-version
Remove path from activeTheme
2013-09-12 07:40:37 -07:00
Hannah Wolfe
6307e4f3dc Merge pull request #695 from skattyadz/issue-376 2013-09-12 15:38:46 +01:00
Adam Howard
00199cee67 Refactor the initial boot of Ghost, allowing Ghost updates to keep current configuration intact.
Extracts all express-server-related code in index.js to core/server.js, leaving index.js purely for booting up Ghost's core components in a sensible order.

Aside from the project's tidiness, this means that we can perform asynchronous configuration loading/checks before requiring any modules that read the config.
2013-09-12 15:38:11 +01:00
Hannah Wolfe
4f05888079 Merge pull request #690 from sebgie/issue#628 2013-09-12 15:27:43 +01:00
Sebastian Gierlinger
212521712d Clean up config (drop 'env')
closes #628
- removed .env from config.js
- ghost.config() returns correct config for NODE_ENV
- removed .env[process.env.NODE_ENV]
- updated tests
- deleted users.hbs, plugins.hbs, appearance.hbs (forgot to delete in PR #649)
2013-09-12 15:25:58 +01:00
Hannah Wolfe
cc785cc981 Merge pull request #686 from matthojo/Sign-up-screen-UI
Improved Auth screen markup and validation checks
2013-09-12 06:25:27 -07:00
Hannah Wolfe
4cd9f79116 Merge pull request #703 from matthojo/Dashboard-Removal
Temporarily removed the Dashboard and all references
2013-09-12 06:19:59 -07:00
Matthew Harrison-Jones
2678de902d Improved Auth screen markup and validation checks
* Signup now focuses on 'name' on load
* Fixed fade in on auth forms to work with `display: table`
* The 'name' field is required on Sign up forms
* The length check on the Signup form is in order of inputs
* Added check for password length
* Changed the auth form class names to better represent individual pages
* Updated CasperJS tests
2013-09-12 09:59:58 +01:00
Hannah Wolfe
010d6c275b Merge pull request #706 from sebgie/fix-blog-logo
Fix for image upload with clean database
2013-09-11 12:07:49 -07:00
Sebastian Gierlinger
8d16b20c49 Remove path from activeTheme
no issue
- obvious
2013-09-11 19:51:56 +02:00
Sebastian Gierlinger
cfb83d6e40 Fix for image upload with clean database
no issue
- reversed workaround for PUT to model
- changed save function for image to unset availableThemes
2013-09-11 16:45:59 +00:00
Hannah Wolfe
eadc8b9371 Fixing minor bug in settings template 2013-09-11 16:27:54 +01:00
Matthew Harrison-Jones
a85e8e1efc Temporarily removed the Dashboard and all references
This also updates the CasperJS to match the new changes.
2013-09-11 15:38:09 +01:00
Hannah Wolfe
f84de01dc0 Merge pull request #698 from skattyadz/issue-642
Allow UPPERCASE in tag names
2013-09-11 06:53:24 -07:00
Hannah Wolfe
821106b5f0 Merge pull request #697 from jamesbloomer/619-image-upload-overwrites-existing-images-merge
Ensure image uploads do not overwrite if they have the same name
2013-09-11 06:51:55 -07:00
Hannah Wolfe
d89b457257 Merge pull request #693 from gotdibbs/Issue511
Remove publish status reversion on failed save
2013-09-11 06:38:37 -07:00
Hannah Wolfe
61444bcf9a Merge pull request #692 from gotdibbs/Issue352
Publish button fixes
2013-09-11 06:37:26 -07:00
Hannah Wolfe
695d2faeaa Merge pull request #681 from matthojo/Notifications-On-Mobile
Improved visibility of notifications on mobile devices
2013-09-11 06:35:51 -07:00
Adam Howard
90549fbb07 Allow UPPERCASE in tag names
Fixes #642

Fairly self-explanatory
2013-09-11 00:38:45 +01:00
jamesbloomer
3e28803672 Ensure image uploads do not overwrite if they have the same name
closes #619
- check if uploaded image name exists in month/year path
- if unique then save
- if not unique then add -1 to the end of the name eg. image-1.jpg
- if image-1.jpg exists then increment to -2
- keep going until a unique name is found
- uses tail recursion as normal path will be to save the first filename and deep recursion will be the exception
- (the alternative of loading the names of all the files in the directory could result in a large in memory array)
2013-09-10 22:02:28 +01:00
Hannah Wolfe
687d7ed72d Changing icon setting to cover in defaults
issue #571

- forgot to do this
2013-09-10 20:05:35 +01:00
John O'Nolan
79975e4697 Merge pull request #694 from M165437/mobile-friendly-ui
Add breakpoint to switch to mobile friendly form layout
2013-09-10 09:47:10 -07:00
Michael Schmidt-Voigt
4d29a36b75 Add breakpoint to switch to mobile friendly form layout
issue #149
- added breakpoint at 550px to change form layout
- labels are on top of form fiels
- form fields change to 100% width
2013-09-10 13:30:06 -03:00
William Dibbern
48a4c30fef Remove publish status reversion on failed save
Fixes #511

- Removed logic to revert publish status back to page default on error.
2013-09-10 09:42:27 -05:00
William Dibbern
2329b34be7 Publish button fixes
Fixes #352

- Ensure publish button's default status is set in the `render`
function.
- Ensure publish button's popup arrow has animation reverted when a
status has been selected.
- Bumped up timeout in failing mocha test for exports-002.
2013-09-10 09:32:02 -05:00
John O'Nolan
9031ae49b2 Merge pull request #689 from matthojo/User-Menu-Links
Removed unused user menu items and linked "Help / Support" to the right place
2013-09-10 07:16:11 -07:00
Matthew Harrison-Jones
2280276fdd Removed unused user menu items and linked "Help / Support" to the right place
Also updated CasperJS tests to support changes
2013-09-10 15:05:42 +01:00
John O'Nolan
087872484b Merge pull request #688 from matthojo/Post-Menu
Temporarily remove unused Post Menu options
2013-09-10 06:03:05 -07:00
Matthew Harrison-Jones
84c2767da6 Temporarily remove unused Post Menu options 2013-09-10 13:53:01 +01:00
Hannah Wolfe
9d7db3155d Merge pull request #678 from matthojo/iOS-White-Space-Bug
Bug Fix: Fixed extra white space on landscape to portrait orientation change
2013-09-10 02:53:49 -07:00
Hannah Wolfe
0b69b60d77 Merge pull request #676 from ErisDS/markdown-fixes
Further improvements to markdown implementation
2013-09-10 02:50:16 -07:00
Matthew Harrison-Jones
0e3cefa770 Bug Fix: Fixed extra white space on landscape to portrait orientation change
This breaks focus on focused element to keep layout. This is because the
layout still breaks if an element is focused, and you cannot trigger
the system keyboard through Javascript to refocus an element after.
2013-09-10 10:21:43 +01:00
Hannah Wolfe
315c932cec Merge pull request #576 from tgriesser/bookshelf-upgrade 2013-09-10 09:50:07 +01:00
Tim Griesser
bfded1e4c1 bumping bookshelf & knex deps 2013-09-10 09:48:17 +01:00
Hannah Wolfe
1baa2c46fb Upgrading sqlite3 to remove build dependencies
- This is the best commit ever.
- sqlite3 no longer has any build dependencies on major platforms
- HUZZAH
2013-09-10 08:46:07 +01:00
Hannah Wolfe
773fe0f3d9 Further improvements to markdown implementation
closes 644

- replaced showdown's implementation of bold and emphasis with a version close to marked's
- reverted the underscore-in-word handling to only deal with 2 or more underscores & commented the test this causes to fail - this was causing problems with double underscores.
2013-09-09 22:55:32 +01:00
Hannah Wolfe
48601ee881 Merge pull request #674 from cobbspur/loadfix
fixed loading icon bug
2013-09-09 12:19:56 -07:00
cobbspur
f3d58f5ecb fixed loading icon bug
closes #662

- stops loading cat icon appearing by mistake
2013-09-09 20:18:35 +01:00
Hannah Wolfe
fd3206311b Merge pull request #673 from JohnONolan/fav
New favicon
2013-09-09 11:37:08 -07:00
John O'Nolan
1d2f6c96d3 New favicon 2013-09-09 20:14:34 +02:00