Commit Graph

814 Commits

Author SHA1 Message Date
Hannah Wolfe
946544996c Updating forgotten password email template
closes #288

- added sign off using url from config
2013-09-09 11:51:12 +01:00
John O'Nolan
64ad0214db Kill off old image fixtures and ignore user-uploaded images 2013-09-09 12:44:38 +02:00
John O'Nolan
d85ec43fb9 Updated modal styles 2013-09-09 11:20:44 +02:00
Hannah Wolfe
1e90c2dfbf Merge pull request #661 from JohnONolan/uploader-bugs
Added styling enhancements to image uploader
2013-09-09 02:00:50 -07:00
Hannah Wolfe
3f51d51e47 Merge pull request #656 from JohnONolan/signup-screen
Signup screen
2013-09-09 01:59:32 -07:00
John O'Nolan
debae0e307 Added styling enhancements to image uploader 2013-09-09 10:33:42 +02:00
Hannah Wolfe
a69cb49105 Merge pull request #649 from sebgie/issue#345
Clean up settings/general screen
2013-09-09 01:32:35 -07:00
Hannah Wolfe
4307f48084 Merge pull request #655 from cobbspur/userprofile
User Profile Image Upload
2013-09-09 00:59:57 -07:00
John O'Nolan
1e7e6631bd Added styles for forgotten password screen 2013-09-09 08:58:24 +02:00
Sebastian Gierlinger
e51a14ee90 Clean up settings/general screen
Closes #345
- added blog description to general screen
- removed content screen from sidebar
- removed beforeRender from settings front end
- removed content screen from tests
2013-09-08 22:12:48 +02:00
John O'Nolan
229597d341 Input signup name into user profile 2013-09-08 21:16:40 +02:00
John O'Nolan
58b97497a3 New signup screen styling + new name field. 2013-09-08 20:39:55 +02:00
Hannah Wolfe
61e5212fd7 Merge pull request #654 from JohnONolan/center-login
Center login
2013-09-08 11:33:34 -07:00
cobbspur
9ce0e9f4a0 User Profile Image Upload
closes #280

- adds image uploader to user profile page.
- click on cover picture or change cover button to open file upload modal.
- created new upload modal that extends model to reduce some code duplication
2013-09-08 17:19:57 +01:00
John O'Nolan
4ed9ef487a Get notifications in the right place on login
Closes #588
2013-09-08 18:08:11 +02:00
John O'Nolan
f641bdbc4f Turn off the register link 2013-09-08 18:00:58 +02:00
John O'Nolan
5ae36b00c9 Updating tests 2013-09-08 17:56:45 +02:00
John O'Nolan
4b40bb5aab Center login form with CSS instead of JS 2013-09-08 17:12:25 +02:00
Hannah Wolfe
8a5f96b635 Merge pull request #640 from jgable/fixFancyPlugin
Fix FancyFirstChar nested tag content
2013-09-07 15:57:58 -07:00
James Inman
ad46b853c4 Notifications are too long
Closes #560, #436, #545, #437

* Added .s to the end of all post notification messages, per #437.
* Added nice message when saving a draft per #436, also for other post statuses (your post will be published), etc.
* Removed post name from notifications per #560 and #545.
* Changed delete post error message to be "Your post could not be deleted. Please try again."

NB: There may be an issue with the format of error messages which could be a separate bug?
2013-09-07 17:18:23 +01:00
John O'Nolan
19c83f90d1 Merge pull request #647 from jfi/iss643
Shortcut for italic inserts _ instead of *
2013-09-07 08:46:09 -07:00
James Inman
4c72a5e328 Shortcut for italic inserts _ instead of *
Closes #643

Pressing Ctrl + I/Cmd + I when text is selected in Markdown mode now inserts _ instead of * around the selected text.
2013-09-07 16:38:04 +01:00
Jacob Gable
e56a0badb5 Fix FancyFirstChar nested tag content
Added some white space skipping and inner tag checking to the fancify
method.
2013-09-06 20:32:20 -05:00
Hannah Wolfe
fa37a56922 Updating to latest Casper 2013-09-06 18:51:22 +01:00
Hannah Wolfe
4a0309a527 Merge pull request #637 from sebgie/issue#625 2013-09-06 18:47:24 +01:00
Sebastian Gierlinger
d9fb23496c Clean up config (non-env based settings)
closes #625
- removed defaultLang, forceI18n and activePlugins from config
- added values to default-settings.json
- updated to use values from settings
2013-09-06 18:46:50 +01:00
Hannah Wolfe
630c03d4d4 Fixing issues with {{url}}
closes #639

Updated url helper to work
Updated tests
Changed helper.js in tests/unit to be called testUtil to avoid confusion
2013-09-06 18:23:22 +01:00
Hannah Wolfe
2f6828ed6c Merge pull request #634 from sebgie/issue#593
Add setting for posts per page
2013-09-06 08:45:44 -07:00
John O'Nolan
58176b6c98 Merge pull request #638 from matthojo/Modal-Fix
Modal Fixes
2013-09-06 08:10:44 -07:00
Matthew Harrison-Jones
e7f33673e2 Improved Button sizing in Modals
The `min-width` on buttons in Modals has been set to '100px'
2013-09-06 16:01:27 +01:00
Matthew Harrison-Jones
38abb54cad Updated the animation option on Upload Modals to new format 2013-09-06 15:39:26 +01:00
Matthew Harrison-Jones
d73dca66a9 Bug Fix: Modals now fit onto the screen on mobile devices 2013-09-06 15:38:42 +01:00
Matthew Harrison-Jones
44deb1c0df Bug Fix: Action modals now have centered content and correct spacing
This also adds functionality to Modals, so they can have multiple
styles, e.g 'wide' and 'centered'.
2013-09-06 15:36:16 +01:00
Hannah Wolfe
75a58bcd1e Updating express-hbs to latest
closes #630
2013-09-06 13:33:46 +01:00
Sebastian Gierlinger
27ba9289d6 Add setting for posts per page
closes #593
- added default setting of 6 posts per page
- added posts per page to settings page
- added limit to frontend.js (setting does not change API behavior)
2013-09-05 14:56:09 +02:00
Hannah Wolfe
5bae29a0db Merge branch 'master' into migrations-003
Conflicts:
	core/server/data/migration/index.js
	core/server/models/post.js
2013-09-05 12:40:43 +01:00
Hannah Wolfe
0f70007028 Merge pull request #629 from matthojo/Scroll-Shadows
Fixed scroll shadows not appearing
2013-09-05 03:09:24 -07:00
Hannah Wolfe
d3d5d2f71e Merge pull request #561 from matthojo/User-Settings-Fixes
Design fixes for the user settings panel
2013-09-05 03:05:22 -07:00
Matthew Harrison-Jones
61ac9f7284 Design fixes for the user settings panel
* Bio field now counts down.
* Bio filed count now turns red when < 20
* Cover image now has gradient
* Change button now has square corners
* Removed "forgot password" link
* Change password button is now red
* Change password button is now aligned with the form
* Hover state on the profile picture now reads "Edit Picture"
2013-09-05 10:00:52 +01:00
Hannah Wolfe
6cb7252978 Merge pull request #617 from cobbspur/dropzone2
Adds modal Image uploader on settings page
2013-09-04 14:55:04 -07:00
cobbspur
e61f3684d5 Adds modal Image uploader on settings page
issue #432

adds a modal template for image uploads
adds buttons to settings page to upload images for blog logo and icon
once image is uploaded displays an 'X' to reset back to dropzone
saves image and renders settings page.

ToDo

add url field when clicking on url icon

fix position of 'X' for both settings and editor
2013-09-04 22:03:55 +01:00
Hannah Wolfe
ddcc7b78b6 Removing api calls from server side
closes #603, issue #395

- Changed hard-coded 'JOE BLOGGS' to use author data
- We still had api calls loading data server side before rendering pages.. which is unnecessary.
- Only thing using this was editor title, which is now populated client side
- May improve content screen load time.
2013-09-04 21:51:54 +01:00
John O'Nolan
48e45a049b Merge pull request #631 from sethlilly/typos-and-docs
Corrected typo in code documentation
2013-09-04 11:33:45 -07:00
Seth Lilly
57e3bed9d9 Corrected typo in code documentation
Corrected typo in code documentation

-Changed "atricle" to "article"
2013-09-04 13:45:14 -04:00
Matthew Harrison-Jones
3e3987754a Fixed scroll shadows not appearing
Implemented scroll classes into a jQuery plugin and fixed shadows not appearing when scrolled
2013-09-04 17:21:50 +01:00
Hannah Wolfe
362cd425cc Merge pull request #622 from sebgie/bug_set_null 2013-09-04 16:55:47 +01:00
Sebastian
4abaa8ceee Fix for settings view
no issue
- removed/added availableThemes before/after saving the model
2013-09-04 16:24:59 +01:00
Hannah Wolfe
c469d05c46 Mail settings are per environment
closes #624

- example mail setting in development config
- updated mail module & tests
2013-09-04 16:15:21 +01:00
Hannah Wolfe
c45f911a1e Improving underscore handling
Additional changes to how underscores are handled.
This more closely matches codemirror, but is still not 100%.
2013-09-04 15:20:26 +01:00
Hannah Wolfe
21487aa802 Email errors & cleanup
closes #618

- don't send a welcome email. This appeared to be breaking tests.
- make sure we handle errors from sending emails properly
- use promises when adding notifications
2013-09-04 15:04:25 +01:00