Commit Graph

2000 Commits

Author SHA1 Message Date
Sebastian Gierlinger
d28bf3de4c Improve password reset token
no issue
- added check that a combination of email + expires is rejected after
10 attempts
- changed comparison to time independent method

Thanks to @chiiph for reporting this issue!
2014-01-30 13:00:30 +00:00
Hannah Wolfe
e42c94bec4 Merge pull request #2077 from ErisDS/date-fixes
Post settings published_at date improvements & fixes
2014-01-30 01:56:57 -08:00
Hannah Wolfe
47c5e5aca4 Post settings published_at date improvements & fixes
closes #1866, fixes #2067, fixes #2068

- Upgrade client side moment to 2.4.0 to match the server side script.
- Add a guard to pub date to fix #2067
- Add new format to close #1866
2014-01-29 22:33:43 +00:00
Hannah Wolfe
c2bb793c36 Merge pull request #2052 from Borkason/patch-1
Fix dash-to-triple-hyphen replacement in generateSlug function.
2014-01-28 12:38:20 -08:00
Daniel Niccoli
d092b4ecd2 Altered integration test to cover dashes in slug 2014-01-28 21:27:05 +01:00
John O'Nolan
0750c34f3f Introduce default robots.txt 2014-01-28 20:05:59 +07:00
Hannah Wolfe
be9afc439c Merge branch '0.4-maintenance' 2014-01-28 09:25:38 +00:00
Hannah Wolfe
1afeeaf2d4 Version bump for rc1 2014-01-28 09:20:39 +00:00
Hannah Wolfe
3673638b84 Merge pull request #2055 from JohnONolan/double-scrollbar 2014-01-28 09:11:36 +00:00
John O'Nolan
cf805181e6 Hide extra space taken up by update notification
See #1995
2014-01-28 09:07:36 +00:00
Hannah Wolfe
b4b7783ebd Merge pull request #2054 from ErisDS/issue-1995
Add body class if update is available
2014-01-28 00:53:45 -08:00
Hannah Wolfe
b429e1cfaf Merge pull request #2020 from redwallhp/master
Minor code cleanup of editor keyboard shortcut actions.
2014-01-27 14:36:20 -08:00
Hannah Wolfe
1f32428296 Merge pull request #1972 from jgillich/character-limit
Show character limit below blog description textarea
2014-01-27 14:32:52 -08:00
Hannah Wolfe
604c6e307f Merge pull request #2048 from gimelfarb/fix-1837-errpages-when-force-admin-ssl 2014-01-27 21:58:33 +00:00
Lev Gimelfarb
6cf586aae6 Fix error page resources loading when forceAdminSSL is true
closes #1837
- moved admin theme static resource service above 'checkSSL', otherwise
  when forceAdminSSL is true it will try to redirect them to HTTPS, and
  error pages will be unstyled
2014-01-27 21:57:58 +00:00
Hannah Wolfe
85c90739a3 Merge pull request #2047 from gimelfarb/fix-1836-ssl-detection 2014-01-27 21:56:30 +00:00
Lev Gimelfarb
1df6ac3b94 Detect SSL connection whether or not behind a proxy
closes #1836
- adding server.enable('trust proxy') to let connect framework do the work
  of detecting X-Forwarded-Proto header
- replacing explicit checking for the X-Forwarded-Proto header with just
  'req.secure' boolean check
2014-01-27 21:55:32 +00:00
Hannah Wolfe
ffc5655705 Merge pull request #2044 from PaulAdamDavis/move-styles 2014-01-27 21:51:12 +00:00
Paul Adam Davis
fa98a1ed18 Move styling from some elements from IDs to classes
Closes #1605

* Move styling for `#signup`, `#forgotten`, `#reset`, `#login`, `#usermenu` and `#notifications` to classes

No IDs have been added or removed, so any events shouldn't be affected and it passes all tests.
2014-01-27 21:50:19 +00:00
Hannah Wolfe
5e97bcb950 Merge pull request #2036 from xuduo35/0.4-maintenance
bug caused by unidecode's bug
2014-01-27 13:45:42 -08:00
Hannah Wolfe
d05b7641f3 Merge pull request #2042 from mikl/firefox-upload-button-fix 2014-01-27 21:35:45 +00:00
Mikkel Hoegh
d45d036ecb Refactor click handlers on upload button.
closes #2028
- Instead of binding and unbinding the click event, bind the data to the
  outer scope so we can use a standard click handler.
- Use removeProp instead of setting the property to false when enabling.
- Use the `disabled` as value when disabling.
2014-01-27 21:35:24 +00:00
Hannah Wolfe
63ac0aa665 Merge pull request #2049 from javorszky/iss-1841
Guard against multiple signup events
2014-01-27 13:33:55 -08:00
Hannah Wolfe
b42962c97a Merge pull request #2035 from ErisDS/issue-1908
Post settings don't render on change
2014-01-27 13:29:28 -08:00
Hannah Wolfe
b9e426478d Add body class if update is available
issue #1995
2014-01-27 21:24:53 +00:00
Hannah Wolfe
485ab376c0 Post settings don't render on change
fixes #1908

- each individual update function handles rendering its own item on success or failure, rather than re-rendering the whole group
- also resolved a bug where the published date didn't get reset properly on error
2014-01-27 10:55:22 +00:00
Gabor Javorszky
f3e67f9a76 Guard against multiple signup events
Fixes #1841
* Added initial flag "no" for submission into Signup View
* Flag set to "yes" if submit button clicked
* Error thrown if flag is "yes", thus no subsequent submission sent to API
* Flag set to "no" if ajax returns with error
2014-01-26 22:38:50 +00:00
Hannah Wolfe
199a92d9cb Merge branch '0.4-maintenance'
Conflicts:
	core/server/config/paths.js
	core/test/unit/config_spec.js
2014-01-26 16:11:02 +00:00
Hannah Wolfe
6efc8ffed2 Merge pull request #2038 from ErisDS/issue-2015
Improvement for published posts with no published_at
2014-01-26 08:09:26 -08:00
Hannah Wolfe
7049d0f338 Improvement for published posts with no published_at
issue #2015

- this is another little workaround / improvement to try to reduce the number of people who end up with a published post with no published_at set
- I assume we need to complete #1655 to fix this properly
2014-01-26 12:05:27 +00:00
Xie JinBin
1d1caada6b bug caused by unidecode's bug
close #1986
- remove URL reserved chars after unidecode, because unidecode will produce some URL reserved chars.
2014-01-26 19:31:19 +08:00
Hannah Wolfe
b0345b6238 Merge pull request #2024 from jgillich/0.4-maintenance
Use absolute path when storing images
2014-01-26 02:45:24 -08:00
Hannah Wolfe
98d901214c Merge pull request #2032 from hswolff/fix-2011
Have NProgress called for all ajax calls
2014-01-26 02:41:59 -08:00
Harry Wolff
0ea22ab8d0 Have NProgress called for all ajax calls
fixes #2011

- rather than trigger NProgress for fetch calls
 I’ve moved it to be used for all sync calls

- issue #2011 was a result of NProgress only being
 called during a fetch() call, which when saving
 is not used - save() is.  Sync is used by all
 ajax calls.
2014-01-26 00:09:01 -05:00
redwallhp
03759cd03c Minor code cleanup of editor keyboard shortcut actions.
Signed-off-by: redwallhp <matt@ntugo.com>
2014-01-25 21:23:17 -05:00
Hannah Wolfe
951385ec2d Merge pull request #2025 from ErisDS/issue-2000
Start up safely when the activeTheme is not present
2014-01-25 13:06:41 -08:00
Hannah Wolfe
631c0f1900 Merge pull request #2018 from ErisDS/issue-1991
Catch errors when rendering the error template
2014-01-25 13:06:33 -08:00
Hannah Wolfe
b2e5ef4154 Catch errors when rendering the error template
fixes #1991

- if there's an error when rendering the error template, default to sending a plain response detailing both errors.
2014-01-25 20:43:28 +00:00
Hannah Wolfe
0dd06f7938 Merge pull request #1996 from JohnONolan/plugins-to-apps
Rename 'plugins' to 'apps'
2014-01-24 14:25:48 -08:00
Hannah Wolfe
6ec7c42947 Start up safely when the activeTheme is not present
fixes #2000

- resolves errors when attempting to start Ghost without the active theme present
- the frontend will render a 500 error page safely
- issues with themes that have an error template are resolved separately in #2018
2014-01-24 22:14:56 +00:00
Hannah Wolfe
0322676657 Merge pull request #1979 from sebgie/fix-session-1
Fix for session handling
2014-01-24 13:20:01 -08:00
Hannah Wolfe
33421e6aba Merge pull request #2017 from ErisDS/issue-1975
Upgrade express-hbs, and switch to using registerPartial
2014-01-24 08:09:51 -08:00
Jakob Gillich
1ee70e3849 Use absolute path when storing images
closes #1983
2014-01-24 16:16:57 +01:00
Hannah Wolfe
3961b7173f Upgrade express-hbs, and switch to using registerPartial
fixes #1964, fixes #1975

 - Issues with partial handling which caused #1964  have been part fixed by handlebars, part worked around by express-hbs, we must use `registerPartials` to ensure partials are handled correctly.
 - Issue with error handling which caused #1975 has also been fixed in express-hbs, which now catches the error from handlebars and passes it to express so that we can handle the error with an error page.
2014-01-24 11:08:15 +00:00
Hannah Wolfe
cccc19842e Merge pull request #2004 from ErisDS/issue-1992
Adding guard to meta_title
2014-01-22 12:38:53 -08:00
Hannah Wolfe
91f59e74af Merge pull request #1949 from jolros/symlinked-themes-bugfix
Including theme partials in a way that supports symbolically linked directories
2014-01-22 11:05:33 -08:00
Hannah Wolfe
20f4af2eb4 Adding guard to meta_title
fixes #1992
2014-01-21 17:24:24 +00:00
John O'Nolan
7ebd104f3f Rename 'plugins' to 'apps'
Fixes #1988
2014-01-21 15:45:27 +07:00
John O'Nolan
185f3c65cd Larger min-height for textareas, and size based on font size 2014-01-21 14:35:47 +07:00
John O'Nolan
b05f00087a Prevent form field descriptions from becoming unwieldily long
Yes that’s a word. As of now.
2014-01-21 14:33:05 +07:00