4635 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt Enlow	80861fa50f	Merge pull request #4966 from ErisDS/check-edit-id ... Check ids match on edit	2015-02-28 09:57:29 -07:00
Matt Enlow	3f1d0b9353	Merge pull request #4965 from ErisDS/validate-image-url ... Validate urls in modal	2015-02-28 09:49:15 -07:00
Hannah Wolfe	8553644760	Add compatibility notice to README	2015-02-28 16:46:16 +00:00
Matt Enlow	05a0dda344	Merge pull request #4964 from ErisDS/xss-fix ... Mark html notifications as html-safe, else escape	2015-02-28 09:41:58 -07:00
Hannah Wolfe	0e80d77100	Only import can override published_by ... no issue - published_by should be set to the current user, unless we are in import mode Credits: Matteo Beccaro	2015-02-28 16:27:30 +00:00
Hannah Wolfe	cde1842750	Check ids match on edit ... no issue - It should not be possible to provide a different ID in the object being edited to that provided in the URL - We now send the id to check object to ensure there is a match Credits: Matteo Beccaro	2015-02-28 16:25:37 +00:00
Hannah Wolfe	8be8831adb	Validate urls in modal ... - Urls added via a model are stored in the DB and need to be validated Credits: Abdel Adim Oisif	2015-02-28 16:24:34 +00:00
Hannah Wolfe	e75939c083	Mark html notifications as html-safe, else escape ... no issue - Use the double-tash escaping output for notification messages - Mark known and trusted html notifications as html-safe Credits: Abdel Adim Oisif	2015-02-28 16:22:38 +00:00
Hannah Wolfe	a9389bf682	Upgrading Casper to 1.1.6	2015-02-28 16:17:29 +00:00
Matt Enlow	56a138847a	Merge pull request #4962 from ErisDS/global-nav ... Make the {{navigation}} helper global	2015-02-28 08:52:45 -07:00
Hannah Wolfe	2450f18170	Make the {{navigation}} helper global ... refs #4535 - Rather than storing navigation data as a top level key, store it as @blog.navigation - Reference the global data from the helper	2015-02-28 12:53:00 +00:00
Sebastian Gierlinger	00ec9e569f	Merge pull request #4961 from ErisDS/release-update ... Adding npm shrinkwrap during release	2015-02-27 22:21:00 +01:00
Hannah Wolfe	65fe7374f9	Adding npm shrinkwrap during release	2015-02-27 17:15:38 +00:00
Sebastian Gierlinger	ab2c57efe9	Merge pull request #4821 from markstos/https-subdirectory ... Fixes #4435, also refactors checkSSL to be unit-tested.	2015-02-27 15:24:31 +01:00
Matt Enlow	2f04e85130	Merge pull request #4954 from halfdan/express ... Upgrade express.js to 4.12	2015-02-26 07:50:37 -07:00
Matt Enlow	ca4c4c17de	Merge pull request #4950 from ErisDS/nav-flag-remove ... Remove navigation config flag	2015-02-26 07:50:23 -07:00
Matt Enlow	b8d0e4be73	Merge pull request #4952 from jaswilli/simple-reorder ... Simplify navigation item reordering	2015-02-26 07:49:57 -07:00
Fabian Becker	e7246a4ef3	Upgrade express.js to 4.12 ... no ref - Fix deprecation warnings	2015-02-26 08:28:37 +01:00
Jason Williams	515abc3080	Simplify navigation item reordering	2015-02-25 17:26:25 +00:00
Hannah Wolfe	70a200d53f	Remove navigation config flag ... ref #4535 - don't need this any more :)	2015-02-25 15:15:55 +00:00
Paul Adam Davis	c473303abf	Improve icon handling code ... Closes #4878 This changes nothing except DRYness of code. Its output is exactly the same. - Moves all icon variables into a map - Add getter function to extract variables from the map	2015-02-25 00:21:56 +00:00
Hannah Wolfe	f489cb1fd2	Merge pull request #4945 from novaugust/navigation_saving_#4942 ... Don't save if nav items have empty labels	2015-02-24 19:21:40 +00:00
Matt Enlow	299fbf9fbd	Don't save if nav items have empty labels ... Closes #4942, Closes #4944 - Also adds the `order` prop to the lastItem on save, so it doesn't jump about	2015-02-24 11:50:07 -07:00
Hannah Wolfe	174b0ea9f2	Merge pull request #4943 from novaugust/navigation_deletion_#4928 ... Fix navigation deletion	2015-02-24 18:01:01 +00:00
Matt Enlow	1f195bdf88	Fix navigation deletion ... Closes #4928	2015-02-23 17:02:48 -07:00
Hannah Wolfe	8cf111e767	Merge pull request #4934 from PaulAdamDavis/fix-nav-order-metadata ... Add `order` property when parsing Navigation JSON	2015-02-23 23:39:06 +00:00
Sebastian Gierlinger	b1d4c3d5c4	Merge pull request #4937 from ErisDS/cleanup ... Remove odd duplication from permissions.json	2015-02-22 21:38:20 +01:00
Hannah Wolfe	10d68386b1	Remove odd duplication from permissions.json	2015-02-22 18:26:32 +00:00
Paul Adam Davis	2843a35ecc	Add order property when parsing Navigation JSON ... Closes #4927 - Add `order` property when parsing Navigation JSON - Fixes CSS issue where the placeholder nav item drag handle was still visible	2015-02-21 14:07:13 +00:00
Hannah Wolfe	2029f264d0	Merge pull request #4935 from PaulAdamDavis/input-error-style ... Add `error` class styles for inputs	2015-02-20 16:17:28 +00:00
Sebastian Gierlinger	ca1d97ab43	Merge pull request #4923 from ErisDS/nav-trailing-slash ... Ensure internal nav items have a trailing slash	2015-02-18 20:40:22 +01:00
Hannah Wolfe	a30b165e13	Merge pull request #4930 from jaswilli/issue-4871 ... Run listener callbacks in Ember run-loops	2015-02-18 19:19:01 +00:00
Sebastian Gierlinger	8b4979c7d1	Merge pull request #4919 from ErisDS/pr/4852 ... Update to PR 4852 ({{navigation}} helper)	2015-02-18 20:00:34 +01:00
Sebastian Gierlinger	27859a9769	Merge pull request #4914 from ErisDS/nav-ux-fix ... Use placeholder only for last item	2015-02-18 19:55:09 +01:00
Sebastian Gierlinger	2032410690	Merge pull request #4924 from ErisDS/issue-2990-grunt-testem ... Add grunt testem alias + some DRY in Gruntfile.js	2015-02-18 19:53:52 +01:00
Jason Williams	1bac657c8c	Run listener callbacks in Ember run-loops ... Closes #4871	2015-02-18 17:11:02 +00:00
Paul Adam Davis	914d2fa1e3	Add error class styles for inputs ... No issue Adds a red border to inputs when a `error` class is applied Also DRY's up the URL input a tad.	2015-02-18 11:34:52 +00:00
Hannah Wolfe	9668ed71ca	Merge pull request #4848 from chilts/i4792-assign-higher-priority-in-sitemaps-to-featured-posts ... Assign a higher priority to featured posts in the sitemap	2015-02-17 21:05:51 +00:00
Hannah Wolfe	6b1c6a5586	Merge pull request #4916 from jimmyhsu/patch-1 ... Minor grammatical fixes to README.md	2015-02-17 20:42:04 +00:00
Hannah Wolfe	6c701ff7f1	Merge pull request #4925 from dbalders/Script_AutoLink ... Added <script> to Not Auto Link and Added Test	2015-02-17 20:01:14 +00:00
John O'Nolan	c997ff52fa	Merge pull request #4870 from PaulAdamDavis/notifications-bug ... Move bottom notifications outlet outside of <main>	2015-02-17 21:22:12 +02:00
David Balderston	6648a17ae2	Added Script to Not Auto Link and Added Test ... Closes #4922 * Added script to not be parsed to auto linking * Added test to make sure urls inside	2015-02-17 11:20:51 -08:00
Hannah Wolfe	2086c8d452	Merge pull request #4915 from dbalders/footnote_bug ... Fixed Bug Showing Full HTML Inside Code Block	2015-02-17 19:14:07 +00:00
Hannah Wolfe	196cd8971e	Add grunt testem alias + some DRY in Gruntfile.js ... refs #2990 - add an alias for grunt testem - add test-setup task to dry up some tasks	2015-02-17 19:12:29 +00:00
David Balderston	2b1bf96130	Fixed Bug Showing Full HTML Inside Code Block	2015-02-17 09:37:15 -08:00
Hannah Wolfe	01dc9bd834	Ensure internal nav items have a trailing slash ... refs #4535 - all internal urls in ghost have a trailing slash, missing it out will cause nav-current to not work	2015-02-16 19:08:41 +00:00
Sebastian Gierlinger	c944644e0d	Merge pull request #4909 from ErisDS/urlfor-external-subdir-fix ... Don't pass external urls through createUrl	2015-02-16 18:52:38 +01:00
Hannah Wolfe	6d42df029a	Navigation helper amends ... closes #4541 - Add role="presentation" to <li> - Clean up space if nav-current isn't present - Changed all internal references from nav to navigation for consistency - Deleted old nav.hbs - Updated tests	2015-02-15 21:44:10 +00:00
Jimmy Hsu	0c429c3aee	Minor grammatical fixes to README.md ... Added an Oxford comma for consistency, and clarified a slightly awkward sentence.	2015-02-14 17:09:14 -08:00
Hannah Wolfe	13a610a8e1	Merge pull request #4901 from felixrieseberg/RSS-Image ... Add Post Image to RSS Feed	2015-02-14 22:35:17 +00:00