TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-16 12:16:09 +03:00
Code Issues Projects Releases Wiki Activity
1,465 Commits 252 Branches 1,686 Tags 366 MiB
8a55d60c2d
Commit Graph

1465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannah Wolfe
8a55d60c2d Merge pull request #1579 from ErisDS/master-fix 
Removing error handling using process.stderr
 2013-11-27 09:22:49 -08:00
Hannah Wolfe
84ce7cc77e Removing error handling using process.stderr 
- process.stdin/out/error is problematic, see https://github.com/joyent/node/issues/3584
 2013-11-27 16:06:56 +00:00
Hannah Wolfe
5601594d3e Merge pull request #1573 from halfdan/1333-pg 
Update Knex/Bookshelf, Fix Postgres Build
 2013-11-27 02:26:17 -08:00
Tim Griesser
726014f59a bumping to knex 0.5 and bookshelf 0.6.1 2013-11-26 23:10:31 +00:00
Fabian Becker
0169f47752 Fix failing migration.reset for Postgres. 
refs #1333
 2013-11-26 23:10:31 +00:00
Hannah Wolfe
a193779a73 Merge pull request #1570 from sebgie/issue#1437 
Remove cookie from Frontend
 2013-11-26 14:49:09 -08:00
Sebastian Gierlinger
e95b592028 Remove cookie from Frontend 
closes #1437
closes #1472

- changed cookie to path:'/ghost'
- added conditional CSRF middleware
- added redirects for signup, signin, signout to /ghost/sign*/
 2013-11-26 10:38:54 +01:00
Hannah Wolfe
cf4fdb3a49 Merge pull request #1555 from halfdan/1333-allowed-failure 
Add postgres build and allow it to fail.
 2013-11-25 14:04:41 -08:00
Hannah Wolfe
330722efdc Merge pull request #1535 from hswolff/create-config-module 
Create config module to standardise getting paths and abs URLs
 2013-11-25 14:03:29 -08:00
Hannah Wolfe
b7a8ea5945 Merge pull request #1565 from ErisDS/redirect-fixes 
Putting back relative redirects
 2013-11-25 13:57:07 -08:00
Harry Wolff
b920662790 Create the config module, initially used 
to standardise getting paths and absolute URLs.  Easy
to extend for other configurations we may need.
 2013-11-25 16:35:16 -05:00
Hannah Wolfe
4730ff78e2 Merge pull request #1557 from alicoding/issue1556 
Issue #1556 - Fix meta_title is undefined
 2013-11-25 13:31:34 -08:00
Hannah Wolfe
5ad2d6178b Putting back relative redirects 
issue #1523

- also added some comments to indicate the difference between the two custom middleware files.
 2013-11-25 21:00:27 +00:00
Hannah Wolfe
71ddd73a00 Merge pull request #1559 from sebgie/failing-tests 
Fix failing casper tests
 2013-11-25 12:50:39 -08:00
Sebastian Gierlinger
3627d48445 Fix failing casper tests 
no issue
- spam test: changed waitForSelector to waitForText
- feature test: changed waitForRessource to watiForSelector
 2013-11-25 16:03:54 +01:00
ali
7946431b8d Issue #1556 - Fix meta_title is undefined 
Closes #1556 and #1530

This should also fix meta_description in #1530 as well as the other bug that is not
filed for body_class
 2013-11-25 13:47:56 +00:00
Fabian Becker
3cb80a2ed9 Add postgres build and allow it to fail. 
refs #1333
 2013-11-25 00:41:40 +00:00
Hannah Wolfe
727b845254 Merge pull request #1523 from halfdan/527-subdir-support 2013-11-24 21:20:24 +00:00
Fabian Becker
e210e75e97 Install in sub-directory support. 
refs #527
 2013-11-24 21:11:34 +00:00
Hannah Wolfe
53af625c49 Merge pull request #1247 from sebgie/bookshelf-session 
Replace cookieSession with session
 2013-11-24 10:43:26 -08:00
Hannah Wolfe
d6aa1df49d Merge pull request #1548 from bastilian/improve_image_uploader_ui 
Improve image uploader UI
 2013-11-24 10:07:38 -08:00
Hannah Wolfe
fd3010b07c Merge pull request #1552 from bastilian/markdown-underscores 
Modified ghostdown markdown extension to allow for 4+ inline underscores
 2013-11-24 09:48:47 -08:00
Daniel Hanson
03be4abaaa Modified ghostdown markdown extension to allow for 4+ inline underscores 
See #1113
- added additional regex rule to replace 4+ underscores with their coded equivalent: _
 2013-11-24 17:39:01 +01:00
Sebastian Gräßl
038e0cf3c1 add test for allowing 4 underscores in markdown 2013-11-24 17:38:12 +01:00
Sebastian Gierlinger
3f2258e95b Replace cookieSession with session 
- changed cookieSession to session
- added session.regenerate for login and logout
- added bookshelf session store
- added session table to database
- added import for databaseVersion 001
- added grunt task test-api
- cleanup of gruntfile to start express when needed only
- moved api tests to functional tests
 2013-11-24 15:29:36 +01:00
Hannah Wolfe
80eb56edd2 Merge pull request #1539 from niedbalski/master 
[Feature Request] Theme API: add has_tag helper to coreHelpers.
 2013-11-24 06:19:18 -08:00
Hannah Wolfe
7d98fab6c1 Merge pull request #1551 from danschumann/patch-1 
Update base.js
 2013-11-24 01:45:56 -08:00
danschumann
4eaf544ad7 Update base.js 
No longer need `|| 'development'`, since it is defaulted in the top index.   If we did need `|| 'development'` here, we'd need it on the next line too, otherwise it breaks.
 2013-11-23 22:29:08 -08:00
Hannah Wolfe
ae31304af0 Merge pull request #1550 from bastilian/fix_1532 
Fix tag input field
 2013-11-23 14:37:30 -08:00
Hannah Wolfe
7db5481f92 Merge pull request #1533 from jgillich/permalinks 
Add Customisable Permalinks
 2013-11-23 14:29:02 -08:00
Sebastian Gräßl
9692f1d577 fix tag input field 
closes #1532
- giving higher priority to css selector for .tag-input in order to override global input-style
- remove padding set by global input-style to align nicely with already set tags
 2013-11-23 19:45:42 +01:00
Hannah Wolfe
d09caf63c8 Merge pull request #1549 from ErisDS/config-loader-fix 
Temporary fix for config loader
 2013-11-23 10:02:22 -08:00
Hannah Wolfe
ab2eb18b86 Temporary fix for config loader 
issue #1521

- Reverting some of the refactor towards including Ghost as a module as it prevented Ghost from loading when no config was available.
 2013-11-23 17:54:47 +00:00
Hannah Wolfe
2701f3e664 Merge pull request #1534 from jgable/passwordReset 
Improved Password Reset Tool
 2013-11-23 08:44:08 -08:00
Sebastian Gräßl
bf9b5570a1 Improve image uploader UI 
closes #1356
- add button to toggle back to uploader from image-url interface
- put save button next to url-input
- make box-height consistent
- position ui-elements to have equal padding all around to border
 2013-11-23 17:33:38 +01:00
Jakob Gillich
83d047c0ba Add Customisable Permalinks 2013-11-23 17:02:17 +01:00
Hannah Wolfe
2c43d3c520 Merge pull request #1521 from hswolff/ghost-as-a-module 
Ghost as a module, fixes #1326
 2013-11-23 03:49:05 -08:00
Harry Wolff
e76d23cb19 Make it possible to require ghost as a module. fixes #1326 2013-11-22 22:59:14 -05:00
Hannah Wolfe
7a1503cf52 Merge pull request #1415 from sebgie/import-transaction 
Add transactions for import
 2013-11-22 14:14:34 -08:00
Hannah Wolfe
548079ca94 Merge pull request #1544 from ErisDS/client-model-fix 
Bugfix handle model and collection separately
 2013-11-22 14:07:36 -08:00
Hannah Wolfe
c6b3eb33cf Merge pull request #1540 from jgillich/fix 
Remove unneccessary type conversion
 2013-11-22 14:07:29 -08:00
Hannah Wolfe
6394add9d6 Bugfix handle model and collection separately 
issue #1533

- replaces templateModel which was a weird hybrid with progressModel and progressCollection
 2013-11-22 21:48:37 +00:00
Jacob Gable
34e453039b Improved Password Reset Tool 
Closes #1471

- add api and User model methods for generating and validating tokens
- add routes and handlers for reset password pages
- add client styles and views for reset password form
- some basic integration tests for User model methods
 2013-11-22 10:46:19 -06:00
Jakob Gillich
184d77156a Remove unneccessary type conversion 2013-11-22 17:21:25 +01:00
Jorge Niedbalski
3782e26516 Added has_tag helper to coreHelpers, added has_tag unit tests. passing OK 2013-11-22 11:19:26 -03:00
Hannah Wolfe
216dd75b2c Merge pull request #1524 from jgillich/rss 
Set RSS link title to blog title
 2013-11-22 02:34:33 -08:00
Hannah Wolfe
6406eefae7 Merge pull request #1531 from jamesbloomer/issue-974 
Allow newline when quotes are used at start of a sentence
 2013-11-22 02:32:58 -08:00
Hannah Wolfe
cdf268e1d5 Merge pull request #1444 from hswolff/ghostjs-cleanup 
Reduce size of server.js, moving code to their related files
 2013-11-22 02:26:16 -08:00
Hannah Wolfe
c6f31ec8fd Merge pull request #1482 from jgable/appProxy 
Pass proxy Ghost interface to Apps
 2013-11-21 14:45:30 -08:00
jamesbloomer
b2ffc2e326 Allow newline when quotes are used at start of a sentence 
closes #974
 2013-11-21 13:56:43 +00:00