Commit Graph

3263 Commits

Author SHA1 Message Date
Hannah Wolfe
90b9c7681c Fixing bad merge 2014-08-18 20:22:10 +01:00
Hannah Wolfe
103ae008aa Merge pull request #3608 from JayBeavers/fixAzureStdin
Fix Azure compatibility issue around stdin in Gruntfile.js
2014-08-18 19:40:37 +01:00
Hannah Wolfe
55198b5a7f Merge pull request #3794 from felixrieseberg/iss3756-2 2014-08-18 19:32:11 +01:00
Felix Rieseberg
ab9fe8752f Post Settings: No 'Author' selection for 'author'
closes #3756
- The post settings menu’s option to change the post’s author isn’t
displayed if the user has the ‘author’ role.
- Also fixed some incorrect indentation in the template (no actual code
change)
2014-08-18 19:29:19 +01:00
Hannah Wolfe
b1c77c70fd Merge pull request #3805 from TryGhost/gui-update-yolo
Gui Update
2014-08-18 19:20:40 +01:00
Hannah Wolfe
3bf3d497cf Fixing tests, PSM and settings pane
- resolving test failures where number of tests changed
- fixing issue with PSM label
- re-removing app settings screen code
2014-08-18 18:16:09 +01:00
Paul Adam Davis
f9ccc9bdcd Update Ghost-UI Bower reference to ~0.9 2014-08-18 18:15:44 +01:00
John O'Nolan
04536b3916 God damn tests 2014-08-17 22:23:00 +03:00
Hannah Wolfe
734fad2a64 Merge pull request #3762 from blia/dev
Fixed TypeError when updating slug
2014-08-17 16:02:14 +01:00
John O'Nolan
c4b87bbfeb Content management cleanup 2014-08-17 15:01:35 +03:00
John O'Nolan
137c0129db Settings nav overhaul 2014-08-17 15:01:35 +03:00
John O'Nolan
5f0bca1166 Disable Pinterest inside Ghost admin 2014-08-17 14:58:03 +03:00
Paul Adam Davis
5912286b35 Use old form styles with class changes for radios & checkboxes 2014-08-17 14:58:03 +03:00
Paul Adam Davis
10ffe68c08 Working new dropdowns
- Implement new GUI 2.0 dropdowns into templates
2014-08-17 14:58:03 +03:00
John O'Nolan
85b7819791 Implement new button markup 2014-08-17 14:57:07 +03:00
John O'Nolan
c10d555a2e New publish button markup implementation 2014-08-17 14:53:47 +03:00
John O'Nolan
2e4f2a262d Adding global app frame wrappers
This makes the new responsive styles work in a basic way. It'll probably need revisiting to break out the header area into a partial (maybe?)
2014-08-17 14:53:47 +03:00
John O'Nolan
0c56a2478b Implement new global-nav markup 2014-08-17 14:40:44 +03:00
Hannah Wolfe
9b7be32c0c Merge pull request #3775 from felixrieseberg/iss3765
Ensure Owner's role isn't downgraded
2014-08-16 17:07:41 +01:00
Felix Rieseberg
47ba9a7385 Ensure Owner's role isn't downgraded
closes #3765
- Simple API check to ensure that the owner isn’t downgraded to a
different role (analog to the ’can’t change your own role’ check)
- Test added to ensure Owner can't be downgraded to a lower role
2014-08-15 17:44:30 -04:00
Hannah Wolfe
7f4231c83d Merge pull request #3791 from ErisDS/issue-3790
Display correct new Ghost version
2014-08-15 18:34:03 +01:00
Hannah Wolfe
e8ad143705 Merge pull request #3785 from jaswilli/post-status
Revert post status on failed save.
2014-08-15 18:27:47 +01:00
Hannah Wolfe
260d9562e4 Merge pull request #3670 from felixrieseberg/iss3641
Validation fix for number of posts/page
2014-08-15 18:27:14 +01:00
Hannah Wolfe
52d0a83dc2 Display correct new Ghost version
closes #3790
2014-08-15 18:23:55 +01:00
Hannah Wolfe
083dc0903b Restore email templates in npm package
no issue

- apparently npmignore's globbing rules are different to grunts. The rule *.html has been interpretted as all html files and the email templates are missing from the npm package.
- this fix tells npm not to ignore email templates, so that they will be present in the next release
2014-08-15 17:53:59 +01:00
Hannah Wolfe
d2e09de0de Merge pull request #3769 from novaugust/iss3764
Hide role dropdown on user page if user is owner
2014-08-15 17:53:46 +01:00
John O'Nolan
1bf6c5791c Merge pull request #3788 from jillesme/master
Open the e-mail sending support page in a new window.
2014-08-15 17:15:01 +02:00
Jilles Soeters
6249d28a92 Added target="_blank" to all links that go to the support page. 2014-08-15 16:46:24 +02:00
Jilles Soeters
ecdf5cec21 Open the e-mail sending support page in a new window. 2014-08-15 16:20:52 +02:00
Hannah Wolfe
91ef11f853 Improve documentation section in CONTRIBUTING.md 2014-08-15 09:37:02 +01:00
Jason Williams
24a97db1be Revert post status on failed save.
Refs #3667, Refs #3776
- If saving a post fails, revert its status back to the
  pre-save value.
- Added tests to check post status after failed save attempt
  on both new and existing posts.
2014-08-15 00:22:10 +00:00
Hannah Wolfe
868219d0a9 Merge pull request #3776 from felixrieseberg/iss3667
Ensure editor awareness if publishing fails
2014-08-14 21:19:21 +01:00
Hannah Wolfe
b1386fccc3 Merge pull request #3738 from felixrieseberg/iss3728
Error notification if send test mail returns 500
2014-08-14 20:38:08 +01:00
Hannah Wolfe
62b46bac57 Merge pull request #3749 from novaugust/ghost-logo-link
Update ghost-logo, amend the amdendments, death to jQuery
2014-08-14 20:19:00 +01:00
Hannah Wolfe
a8fdc7ac43 Merge pull request #3773 from jaswilli/settings-tests
Fix and enable general and user settings tests.
2014-08-14 20:05:42 +01:00
Felix Rieseberg
6e8c98e27c Ensure editor awareness if publishing fails
closes #3667
- If the ‘save’ function on a new post fails, the local Ember model
still beliefs that the status is ‘published’, resulting in wrong
buttons. A simple catch fixes that.
2014-08-14 11:05:05 -07:00
Felix Rieseberg
f19c2be6fe Validation fix for number of posts/page
closes #3641
- Reworded error messages, remove “please” (credits go to @YouriAckx)
2014-08-13 12:08:09 -07:00
Hannah Wolfe
8c975284af Merge pull request #3753 from pedro-teixeira/master
Installation as root fails on bower
2014-08-13 18:34:01 +01:00
Hannah Wolfe
afa9d5500e Merge pull request #3746 from jaswilli/update-sqlite3
Update dependency sqlite3@2.2.7
2014-08-13 18:31:56 +01:00
Hannah Wolfe
048cdc5f16 Merge pull request #3733 from rwjblue/use-ghost-paths-util
Use the ghost-paths consistently.
2014-08-13 18:28:11 +01:00
Hannah Wolfe
2aed220e9e Merge pull request #3647 from felixrieseberg/iss3644
Accept all versions of 'edit' as URL parameter
2014-08-13 18:22:18 +01:00
Jason Williams
2eb9a48c48 Fix and enable general and user settings tests. 2014-08-13 14:14:29 +00:00
Matt Enlow
8748895607 Hide role dropdown on user page if user is owner
Closes #3764
2014-08-12 18:06:34 -06:00
Kirill Yakovenko
d812f99174 Fix TypeError when updating slug
- added check slug before trim
2014-08-12 17:46:14 +03:00
Pedro Teixeira
c68859cde9 Add --allow-root for ghost_ui grunt task
closes #3753
2014-08-11 21:47:45 +02:00
Felix Rieseberg
0720033e38 Error notification if send mail api returns 500
closes #3728
- If the mail config is broken, the ajax call will fail with 500 and
not return an error.
- This change catches 500 and wraps the error in a notification.
2014-08-11 09:15:12 -07:00
Matt Enlow
10f3efa388 Update ghost-logo, death to jQuery
Amends #3740 (which amended #3736), ref #3623
- Removed futzy jquery for setting href on logo; binding to ApplicationView property
- Killed dead code
2014-08-11 09:52:55 -06:00
Jason Williams
ce20d93006 Update dependency sqlite3@2.2.7
No Issue
- sqlite3 2.2.7 supports building on node v0.11.13.
2014-08-11 13:47:09 +00:00
Hannah Wolfe
b6507bed9b Version bump to 0.5.0 2014-08-11 12:31:42 +01:00
Hannah Wolfe
1e14cac5ce Merge pull request #3740 from PaulAdamDavis/ghost-logo-link
Change Ghost logo link back to an anchor
2014-08-11 12:20:42 +01:00