Commit Graph

1526 Commits

Author SHA1 Message Date
Hannah Wolfe
f3923c463e Merge pull request #1648 from KingKarl85/api-slashes
backbonejs model conflict with connect-slashes
2013-12-12 04:47:59 -08:00
Hannah Wolfe
589b4a8cea Merge pull request #1632 from hswolff/issue1582
Debounce post settings events
2013-12-11 15:05:53 -08:00
Karl Mikkelsen
12c307fa6d backbonejs model conflict with connect-slashes
close #1648
- backbonejs model doesn't include tailing slash by default
- connect-slashes returns 301 for GET without tailing slash
- overwrote backbone model url method to include tailing slash
2013-12-11 21:33:01 +11:00
Hannah Wolfe
c1683e53f2 Merge pull request #1650 from hswolff/issue-1644
Fix loading of static pages in frontend controller
2013-12-10 15:43:06 -08:00
Harry Wolff
9bbf400dfc Fix loading of static pages in frontend controller
fixes #1644

- Fixes bug in controller/frontend
- Created functional test for posts API to test for this bug
- Created unit tests for frontend controller
- Fixed a global variable leak in core/test/utils/fixtures/data-generator
that was leaking the DataGenerator globally
- Resolved issue that arose from fixing above bug
2013-12-09 22:38:25 -05:00
Hannah Wolfe
119af63ff7 Merge pull request #1630 from hswolff/remove-ghost-singleton
Remove ghost.js
2013-12-08 15:14:05 -08:00
Hannah Wolfe
fe8e24db6d Merge pull request #1635 from ErisDS/update-dev-deps
Updating devDependencies to latest versions
2013-12-08 14:42:57 -08:00
Hannah Wolfe
365b4ca50c Updating devDependencies to latest versions 2013-12-08 17:42:34 +00:00
Harry Wolff
7bc4d43be7 Debounce post settings events
fixes #1582
2013-12-07 16:26:06 -05:00
Harry Wolff
c8c02a65fa Remove ghost.js
fixes #1575
- Moves most code that was in ghost.js into ./core/server/index.js
- Creates ./core/server/config/theme.js to hold all theme configurations 
(which previously lived on ghost.blogGlobals())
- Removed ghost.server, passing it in as an argument where needed 
and allowing middleware to hold onto a reference for lazy use.
2013-12-07 10:10:02 -05:00
Hannah Wolfe
2636e1c1e3 Reverting express-hbs to 0.5.1
- there is some sort of bug with 0.5.2 when combined with recent changes which results in the following error:

/home/travis/build/TryGhost/Ghost/node_modules/express-hbs/lib/hbs.js:128
      if(count < self.partialsDir.length){
                                 ^
TypeError: Cannot read property 'length' of undefined
2013-12-07 14:33:13 +00:00
Hannah Wolfe
1b16518e40 Merge pull request #1626 from ErisDS/grunt
Gruntfile cleanup
2013-12-07 03:36:32 -08:00
Hannah Wolfe
7a46c36045 Merge pull request #1627 from sebgie/issue#755
remove ghost.settings and ghost.notifications
2013-12-07 03:36:08 -08:00
Hannah Wolfe
911eb9c908 Merge pull request #1622 from halfdan/update-deps 2013-12-06 21:55:06 +00:00
Fabian Becker
29c5e5c971 Update dependencies.
- Important update for express (contains __proto__ fix in qs)
- Update all other dependencies to latest
2013-12-06 21:54:49 +00:00
Hannah Wolfe
5ae71dd3f0 Merge pull request #1629 from sebgie/issue#1616
Fix error when uploading logo/cover image
2013-12-06 13:41:55 -08:00
Hannah Wolfe
f84f0d18f1 Merge pull request #1608 from halfdan/1095-unicode-words
Upgrade downsize to 0.0.4
2013-12-06 13:03:28 -08:00
Sebastian Gierlinger
8a83e9ea4e Fix error when uploading logo/cover image
closes #1616
- removed pars from model
- changed checkbox handling
2013-12-06 16:43:53 +01:00
Fabian Becker
1f853194ee Upgrade downsize to 0.0.4
refs #1095
- added new unicode test to excerpt helper
2013-12-06 15:43:03 +00:00
Hannah Wolfe
2b7e18f028 Gruntfile cleanup
issue #1340

- remove old weekly and nightly builds and associated stuff
- add help task
- add more documentation / comments
2013-12-06 11:18:27 +00:00
Hannah Wolfe
ed9d216ae7 Merge pull request #1621 from nmec/fix/gitignore
Ignore readme files in subdirectories.
2013-12-06 03:09:58 -08:00
Sebastian Gierlinger
078f464197 remove ghost.settings and ghost.notifications
covers 90% of #755
- moved ghost.settings to api.settings
- moved ghost.notifications to api.notifications
- split up api/index.js to notifications.js, posts.js, settings.js,
tags.js and users.js
- added instance.globals as temp workaround for blogglobals (Known
issue: blog title and blog description are updated after restart only)
- added webroot to config() to remove `var root = ...`
- changed `e` and `url` helper to async
- updated tests
2013-12-06 09:51:35 +01:00
Hannah Wolfe
1b4b228ae4 Merge pull request #1624 from sebgie/test_fails
Fix login test failure
2013-12-05 14:31:34 -08:00
Sebastian Gierlinger
faeef9d209 Fix login test failure
no issue
- added timeout after login limit tests
2013-12-05 15:25:20 +01:00
Jono Warren
6aae14b954 Ignore readme files in subdirectories.
This prevents theme and plugin readme files from appearing as new files.
2013-12-05 10:44:18 +00:00
Hannah Wolfe
696cfe7018 Swap url.resolve for slash handling 2013-12-04 21:20:24 +00:00
Hannah Wolfe
0e7eb47cd9 Merge pull request #1612 from sebgie/issue#1609
Fix failing tests
2013-12-04 12:55:53 -08:00
Sebastian Gierlinger
06e3b158f4 Fix for failing tests
closes #1609
- added wait for output
- changed order of test tasks
2013-12-04 21:20:16 +01:00
Hannah Wolfe
d2d9db3067 Add url.resolve for password reset email url
fixes #1604
2013-12-01 17:46:10 +00:00
Hannah Wolfe
d69e87b625 Merge pull request #1594 from halfdan/1591-excerpt-helper
Fix excerpt/content helpers
2013-11-30 10:16:26 -08:00
Hannah Wolfe
7c3031507d Merge pull request #1593 from ErisDS/app-proxy-update
Direct api access for app proxy
2013-11-30 10:15:20 -08:00
Hannah Wolfe
4765ca2cce Merge pull request #1589 from javorszky/iss499
Adds login limiter
2013-11-30 10:14:55 -08:00
Hannah Wolfe
14940cc397 Merge pull request #1586 from jgillich/live-reloading
Permalinks live reloading support
2013-11-30 10:03:15 -08:00
Fabian Becker
5c1091af10 Fix excerpt/content helpers
fixes #1591
- Convert quoted strings to numbers
- Update code examples
- Update helper tests
2013-11-29 18:58:58 +00:00
Hannah Wolfe
ed6455f5a4 Direct api access for app proxy
- proxy doesn't need a ghost object :)
2013-11-29 16:26:56 +00:00
Hannah Wolfe
41c58cd5eb Merge pull request #1590 from halfdan/1333-pg-travis
Remove direct pg dependency
2013-11-29 08:04:18 -08:00
Gabor Javorszky
c515e20ea3 Adds login limiter
Closes #499
* On wrong passwords, statuses: `active` -> `warn-1` -> `warn-2` -> `warn-3` -> `locked`
* On login check, if user's status is `locked`, login automatically fails and user is encouraged to reset password. Does not even bother to check for passwords.
* login attempts tell user how many attempts she has remaining in notification box
* successful login will reset status to `active`
* resetting password with forgotten password emailed token resets status to `active`
* complete with a test suite
2013-11-29 01:24:25 +00:00
Fabian Becker
a4434fd39a Remove direct pg dependency
refs #1333
- Adjust Travis build to install pg
- Remove pg from package.json
2013-11-29 00:58:24 +00:00
Jakob Gillich
30861fbab8 Permalinks live reloading support
issue #1395
2013-11-28 21:24:31 +01:00
John O'Nolan
e4a5356a69 Merge pull request #1587 from ErisDS/tag-css
Scoping tag styling to the tag control
2013-11-28 11:41:01 -08:00
Hannah Wolfe
505b6d0d6f Scoping tag styling to the tag control
fixes #1309
2013-11-28 19:09:25 +00:00
Hannah Wolfe
dedc5d9239 Update activeTheme path on theme switch
fixes #1583

- the active theme path wasn't getting updated when we were switching theme
2013-11-28 16:10:34 +00:00
Hannah Wolfe
0582470682 Updating to the latest casper
issue TryGhost/Ghost#1577

- adding asset helper for subdirectory support
2013-11-28 15:22:18 +00:00
Hannah Wolfe
7fb45522e0 Merge pull request #1580 from hswolff/death-to-ghost-singleton
Move further away from the ghost singleton object
2013-11-28 06:42:37 -08:00
Harry Wolff
37b2fd93d8 This commit removes a lot of code from ghost.js, including:
Move helper functions registerThemeHelper and registerAsyncThemeHelper
to the helpers module.
Also update the app proxy object to reflect this new code location,
and the tests to reflect that as well

Create ./sore/server/filters which houses all filter related behavior.
Was previously on the ghost singleton.
Also create the filters_spec file for testing
and update all code and tests to use new code location.

Create ./sore/server/helpers/template which houses all template related behavior.
Was previously on the ghost singleton.
Also create the helpers_template_spec file for testing
and update all code and tests to use new code location.

Move ghost.mail instance onto the mail module directly
and update related code and tests to use new location

Move Polyglot instance onto require module directly

Move ghost.availablePlugins to plugins module directly
2013-11-28 09:21:53 -05:00
Hannah Wolfe
16c33ac732 Merge pull request #1225 from enahs/patch-1 2013-11-28 14:02:03 +00:00
enahs
dddf2ec5b2 More verbose error message for invalid JSON in config.js
if you enter an invalid json object such as:
```
{
server: "http://foo.com"
host: "0.0.0.0"
}
```
while configuring, you get errors but are still able to run forever and the message previously was not as indicative of other potential configuration problems.
2013-11-28 13:58:28 +00:00
Hannah Wolfe
12c7f30076 Merge pull request #1110 from rektide/feature-config-arg-rebased 2013-11-28 13:48:34 +00:00
rektide
42dc8b4a8f Accept a config filename as an optional parameter to Ghost start-up.
Closes #1110.
- Promotes config-loader from a validator, to the central place where configuration state is held
- Allow config-loader two means to be told of config file to be used:
  - A preferred first argument passed into Ghost
  - A secondary GHOST_CONFIG environmental variable
- Failing to see either of the above passed in, config-loader will continue to use "config.js"
- Config-loader validates the target configuration (unchanged) & then copies that object into it's own exports
- Components needing to read configuration now require config-loader to retrieve the configuration state
- Config file continues to be loaded via require(): this is assumed to be a static json file
2013-11-28 13:47:00 +00:00
Hannah Wolfe
7b2bf5b98c Merge pull request #1577 from halfdan/527-subdir-admin
Fix Admin interface with sub directories
2013-11-28 05:14:23 -08:00