1645 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Sebastian Gierlinger	77ed7f8ac6	Add transactions for import ... closes #837 - added transaction handling for import - added transactions to model functions - added simple tests for failing imports	2013-11-20 21:36:02 +01:00
Jakob Gillich	0c02161db7	Set RSS link title to blog title	2013-11-20 17:42:37 +01:00
Harry Wolff	985a23f446	Move server middleware configuration to related file	2013-11-19 21:05:57 -05:00
Harry Wolff	ea8d12a607	Reduce size of ghost.js by moving related Routing code to their own files	2013-11-19 21:05:09 -05:00
Hannah Wolfe	1c5a811760	Merge pull request #1449 from sebgie/issue#1398 ... Add schema.js	2013-11-19 11:45:53 -08:00
Hannah Wolfe	10a44799a7	Merge pull request #1485 from Archanium/MinorIssues ... Danish language file and a correction to Markdown modal	2013-11-19 04:35:13 -08:00
Thomas Faurbye Nielsen	20ac198d05	Correct the Markdown for emphasis	2013-11-19 12:59:04 +01:00
Hannah Wolfe	8ec9108558	Merge pull request #1353 from thgaskell/1350-static-page-checkbox ... Allow user to set static page before saving	2013-11-19 03:29:35 -08:00
Hannah Wolfe	ae233f01d8	Merge pull request #1505 from halfdan/1498-lower-email ... Lowercase email address.	2013-11-19 03:10:41 -08:00
Hannah Wolfe	315ca052a9	Merge pull request #1489 from sebgie/issue#1466 ... Fix wrong error message	2013-11-19 03:00:04 -08:00
Sebastian Gierlinger	639c0d0627	Add schema.js ... closes #1398 closes #1399 closes #1400 - added schema.js with database version '000' - refactored migration to use schema.js - if new table is added to schema.js and databaseVersion is increased, table will be added - if new table is deleted to schema.js and databaseVersion is increased, table will be deleted - alter table from issue #1400 is delayed until knex supports column modification - changed import pre checks to work again (will be refactored separately) - added basic PostgreSQL support (Attention: not supported/tested) - changed error handling in server.js	2013-11-18 15:21:15 +01:00
Fabian Becker	89201a5c84	Lowercase email address. ... fixes #1498	2013-11-18 00:34:51 +00:00
Hannah Wolfe	8e9b27f0b5	Remove inline script from default.hbs ... closes #1268	2013-11-16 18:47:55 +00:00
Sebastian Gierlinger	fd60a12469	Fix wrong error message ... closes #1466 - added status code for error object - added test for frontend errors	2013-11-15 15:27:06 +01:00
Hannah Wolfe	9aa14162f0	Adding recommended fields to package.json	2013-11-15 08:36:55 +00:00
Jacob Gable	ef9f5dc33f	Pass proxy Ghost interface to Apps ... Closes #1478 - Create new proxy.js that exposes createProxy method - Pass proxy to App activate/install in lieu of Ghost instance	2013-11-14 20:36:27 -06:00
Hannah Wolfe	9d55e68689	Merge pull request #1458 from mjbshaw/svg ... Add support for SVG images	2013-11-14 12:53:26 -08:00
Hannah Wolfe	1f29029deb	Merge pull request #1462 from hswolff/plugin-init-cleanup ... Move plugin init code into plugin.js and have it called from server.js	2013-11-14 12:38:35 -08:00
Hannah Wolfe	5c90ef286c	Update CONTRIBUTING.md	2013-11-13 08:27:35 +00:00
Harry Wolff	688dd363cd	Move plugin init code into plugin.js and have it called from server.js	2013-11-12 22:52:31 -05:00