4945 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannah Wolfe	541de8bc68	Merge pull request #5384 from JohnONolan/zelditor ... Content management & editor refactor	2015-06-08 16:22:29 +01:00
Hannah Wolfe	dfb7993fde	Merge pull request #5405 from JohnONolan/myth-0.1.0 ... Update Ember-Myth to 0.1.0	2015-06-08 14:58:14 +01:00
Hannah Wolfe	d023333d31	Merge pull request #5404 from JohnONolan/zerrors ... Fixup broken error page styles	2015-06-08 14:57:56 +01:00
cobbspur	3f5ac66e47	Fix up tests post-changes to content and editor screen ... No Issue - some tests removed - other tests commented out pending tags adding to psm	2015-06-08 14:53:53 +01:00
Hannah Wolfe	189814cd32	Merge pull request #5374 from JohnONolan/betterflex ... Better flexbox grids	2015-06-08 12:33:06 +01:00
John O'Nolan	93b0505d68	Fixup broken error page styles	2015-06-08 12:14:58 +01:00
John O'Nolan	1d63428563	Update Ember-Myth to 0.1.0 ... - Fixes grunt dev warnings - Better support for @import	2015-06-08 11:35:20 +01:00
Hannah Wolfe	78f53542af	Merge pull request #5398 from jaswilli/cleanup-update ... Clean up and update ember dependencies	2015-06-07 21:18:48 +01:00
Jason Williams	3a6a6a90ae	Clean up and update ember dependencies ... No Issue - Remove unneeded imports from Brocfile.js. - Move devDependencies up to dependencies. - Update ember-mocha dependencies. - moment@2.10.3 to match version used on backend.	2015-06-06 12:58:07 -05:00
Jason Williams	8196133bc7	Merge pull request #5377 from ErisDS/url-refactor ... Refactor URL usage	2015-06-06 09:50:20 -05:00
Hannah Wolfe	b6b2b3a16f	Merge pull request #5395 from jaswilli/grunt-watch ... Update grunt watch task with new file and option names	2015-06-06 07:09:24 +01:00
Jason Williams	58ab576455	Update grunt watch task with new file and option names	2015-06-05 14:48:04 -05:00
John O'Nolan	5b25dd2929	Content management & editor refactor	2015-06-05 13:58:00 +01:00
Hannah Wolfe	c8a49033a5	Merge pull request #5386 from acburdine/focus-fix ... Fix autofocus on post edit	2015-06-05 13:47:01 +01:00
Hannah Wolfe	5e0cc1ae10	Merge pull request #4783 from claydiffrient/master ... Makes most special characters be replaced with a dash	2015-06-04 11:54:23 +01:00
Hannah Wolfe	311b728b5a	Merge pull request #5391 from jaswilli/notification-cleanup ... Fix call to this.notification	2015-06-04 11:38:14 +01:00
Jason Williams	164fa2768f	Fix call to this.notification ... Refs #5351 - Injected services need to be accessed via .get().	2015-06-04 00:02:03 -05:00
Jason Williams	60e160d169	Merge pull request #5361 from ErisDS/fix-contexts ... Fix context setup (remove dep on req.route.path)	2015-06-03 16:28:16 -05:00
Jason Williams	8c0bc6cea5	Merge pull request #5366 from ErisDS/anon-middleware ... Ensure middleware functions are named	2015-06-03 16:26:56 -05:00
Jason Williams	f16f72ad7a	Merge pull request #5389 from ErisDS/test-imprv ... Ensure importer tests don't clash	2015-06-03 16:18:12 -05:00
Jason Williams	ff8ffa524c	Merge pull request #5388 from ErisDS/update-deps ... Upgrading most production dependencies	2015-06-03 15:04:43 -05:00
Jason Williams	12c4d031fc	Merge pull request #5387 from ErisDS/func-tests ... Improvements for debugging transient test failures	2015-06-03 15:04:02 -05:00
Austin Burdine	b83ca04e72	fixes autofocus on post edit ... closes #5383 - sets the default focus of the editor component to false - removes the check for model.isNew in editor controller	2015-06-03 12:01:32 -06:00
Hannah Wolfe	3d533b68ec	Upgrading most production dependencies ... no issue - includes the majority of upgrades to out-of-date dependencies - lodash is being left as it has backwards incompatible changes, as well as causing unmet deps warnings - glob & cherio are being left as upgrading them causes unmet deps warnings - bookshelf & knex should be done together separately	2015-06-03 18:54:03 +01:00
Hannah Wolfe	8ec8eff6c0	Ensure importer tests don't clash ... no issue - I've noticed the importer tests going wrong on SQLite a couple of times recently. - I think it's because the teardowns were clashing, hopefully this will help	2015-06-03 18:46:45 +01:00
Hannah Wolfe	2d5a731022	Improvements for debugging transient test failures ... refs #4483 - update PSM test to see if it works better this way - ensure every assertion has a message, so that it's clearer what is failing	2015-06-03 18:12:20 +01:00
Jason Williams	5ec1979447	Merge pull request #5380 from acburdine/ghost-ember112 ... Update Ember to 1.12.1 and Ember-Data to 1.0.0-beta.18	2015-06-03 00:07:17 -05:00
Austin Burdine	28d265c9c1	update Ember to 1.12.1/ember-data to 1.0.0-beta.18 ... No issue - fixed "{{#each}}" helper in templates to use block syntax - fixed deprecated ember.controller getter/setter function to use new syntax - removed unnecessary pass-protect route view	2015-06-02 22:26:16 -06:00
Jason Williams	87519f7fd4	Merge pull request #5376 from acburdine/ghost-fastclick ... Reimplement fastclick library	2015-06-02 16:59:42 -05:00
Hannah Wolfe	2700bfa4cc	Refactor URL builder ... refs #1833 - Refactor url generation to use a base urlJoin method - urlJoin handles slash de-duping and subdir de-duping - fixes sitemap xml option	2015-06-02 21:50:17 +01:00
Austin Burdine	27d7718b3c	re-implements fastclick into ember ... closes #5375 - adds an addon for fast click to the npm dependencies	2015-06-02 13:28:16 -06:00
Jason Williams	f233d97ce3	Merge pull request #5372 from ErisDS/char-fix ... Removing non utf-8 char	2015-06-02 10:45:53 -05:00
Hannah Wolfe	7eacd2876d	Ensure middleware functions are named ... refs #5091 - adds names to all middleware functions, for debugging purposes	2015-06-02 14:49:18 +01:00
Hannah Wolfe	9d01016025	Merge pull request #5353 from morficus/issue-5286 ... splitting client authentication-related middleware in to its own file	2015-06-02 11:10:43 +01:00
John O'Nolan	9c7a1e2e50	Merge pull request #5318 from acburdine/private-form ... Rewrite default private.hbs for new zelda styles	2015-06-02 10:54:59 +01:00
John O'Nolan	f395aedaa0	Better flexbox grids	2015-06-02 10:19:35 +01:00
Hannah Wolfe	f5d4d4d378	Removing non utf-8 char ... no issue - I noticed this in CodeClimate, it was reporting errors for this file because of a dodgy char. - Removed it and named the functions whilst I was in there :)	2015-06-02 09:56:02 +01:00
Hannah Wolfe	eb9d924e1b	Merge pull request #5306 from acburdine/remove-email ... Removes "email" from settings	2015-06-02 09:44:21 +01:00
Maurice Williams	b3cbb20be1	splitting client authentication-related middleware in to its own file ... * refs #5286 * includes test cases for `addClientSecret` * no tests first `generateAccessToken` and `authenticateClient` because there isn't anything to test in them	2015-05-31 12:35:03 -04:00
Hannah Wolfe	fc0e1d7e45	Merge pull request #5367 from JohnONolan/themechooser ... Add theme selector, update package mgmt styles	2015-05-31 09:38:12 +01:00
John O'Nolan	83b7993ff3	Add theme selector, update package mgmt styles	2015-05-30 23:12:40 +01:00
Hannah Wolfe	6ab5e70d5f	Merge pull request #5360 from hex337/move-spam-middleware ... Move the spam prevention into its own file.	2015-05-30 19:28:06 +01:00
Hannah Wolfe	8cdabc3546	Merge pull request #5365 from sembrestels/fixed-fixture ... Fixed fixture. Code wasn't formatted.	2015-05-30 19:20:09 +01:00
Sem	72569de3c3	Fixed fixture. Code wasn't formatted.	2015-05-30 05:25:51 +02:00
Alex Kleissner	766bf99de9	Move the spam prevention into its own file. ... issue #5286 - Moved the spam prevention functions into their own file - Added unit tests for the functions	2015-05-29 08:59:29 -07:00
Austin Burdine	bf0e40eda1	rewrites default private.hbs for new zelda styles ... closes #5073 - changes format to match new zelda layout - modifies the input_password helper to allow customization of class & placeholder	2015-05-29 06:25:32 -06:00
Hannah Wolfe	e7a078a541	Merge pull request #5362 from JohnONolan/thememgmt ... First pass theme management page	2015-05-29 13:16:22 +01:00
John O'Nolan	d979ffb55f	First pass theme management page	2015-05-29 13:01:28 +01:00
Hannah Wolfe	cc00c6c64a	Fix context setup (remove dep on req.route.path) ... refs #5344 - As a result of #5344, context are pretty broken. - This PR removes all dependence on req.route.path, and uses res.locals.relativeUrl - res.locals.relativeUrl is used for many things and is dependable	2015-05-29 09:16:04 +01:00
Matt Enlow	da9fcc7a19	Merge pull request #5357 from ErisDS/misc ... Misc grunt /dev updates	2015-05-29 10:10:18 +02:00