1400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Taylor	5e8f2312d3	Merge pull request #270 from nottinghamtec/po-duplicate ... Remove duplicated PO numbers, closes #256	2016-10-23 13:06:29 +01:00
David Taylor	90c8b19915	Added tests for PO non-duplication	2016-10-23 12:45:27 +01:00
David Taylor	d82ef3f8d1	Merge branch 'master' into master	2016-10-23 12:36:29 +01:00
David Taylor	fc006dc53e	Merge pull request #269 from johnathan99j/patch-1 ... Fix table display issue in README	2016-10-23 12:36:10 +01:00
Johnathan Graydon	3ce191aaf2	Update README.md ... Small adjustment to make GitHub markdown display the table.	2016-10-23 12:26:35 +01:00
Johnathan Graydon	6fc89727f2	Stop PO number from duplicating when copying event ... Would close #256	2016-10-21 15:48:54 +01:00
David Taylor	b235ac540f	Merge pull request #265 from nottinghamtec/ra-link ... Add link to pre-event RA	2016-10-19 10:35:58 +01:00
Sam Osborne	97decf8c52	Add link to pre-event RA ... #accessible	2016-10-19 00:54:42 +01:00
David Taylor	97cdf34c18	Merge pull request #263 from nottinghamtec/feature/forum-embed ... Forum embed	2016-10-11 18:56:02 +01:00
Tom Price	92c77c07e0	Fix tailing line breaks	2016-10-11 18:47:13 +01:00
David Taylor	0541a70cec	Fixed event title link (_blank)	2016-10-09 11:30:13 +01:00
David Taylor	e0cb2f4925	Linked RIGS title	2016-10-09 11:26:32 +01:00
David Taylor	68a46af1a8	Fixed rounded corner fail	2016-10-09 11:22:34 +01:00
David Taylor	f61158b9c0	Rounded corners, transparent background	2016-10-09 11:20:43 +01:00
David Taylor	88954eca5c	Removed weird background from embed	2016-10-09 10:40:18 +01:00
David Taylor	3fc04616b3	Added test for cookie warning	2016-10-09 10:36:30 +01:00
David Taylor	2d5f768523	Added cookie check with nice error message	2016-10-09 10:32:58 +01:00
David Taylor	5949ff74ec	Added javascript cookie check, if blocked, login in new tab	2016-10-08 22:55:27 +01:00
David Taylor	879ecd1f6d	Made font size smaller in embed	2016-10-08 21:49:03 +01:00
David Taylor	0e72c3f896	Made pretty, and made embedding accessible to non-keyholders	2016-10-08 21:38:12 +01:00
David Taylor	b93a716a3b	Added unit tests	2016-10-08 20:37:01 +01:00
David Taylor	0d92c3812a	Tidied up python	2016-10-08 19:56:56 +01:00
David Taylor	fc110a0bff	Fixed padding	2016-10-08 19:55:31 +01:00
David Taylor	008edd8bee	Lots of tidying up, moved inline CSS into SCSS	2016-10-08 19:32:45 +01:00
David Taylor	ac7e85c24a	PEP8 and comments	2016-10-08 17:30:23 +01:00
David Taylor	73b8ce4add	Revert "Added decorator for X-Frame header" ... This reverts commit 8a838aa4bd.	2016-10-08 17:19:35 +01:00
David Taylor	511ce554b1	Revert "Try allow-from header (limited browser support)" ... This reverts commit 3f4c362bfa.	2016-10-08 17:19:27 +01:00
David Taylor	536842971d	Revert "Try just removing the header, this should work in all browsers" ... This reverts commit 3e224a33a7.	2016-10-08 17:19:18 +01:00
David Taylor	3e224a33a7	Try just removing the header, this should work in all browsers	2016-10-08 17:14:29 +01:00
David Taylor	3f4c362bfa	Try allow-from header (limited browser support)	2016-10-08 17:01:37 +01:00
David Taylor	8a838aa4bd	Added decorator for X-Frame header	2016-10-07 02:51:08 +01:00
David Taylor	7e379b33db	Fixed login autofocus and error messages	2016-10-07 02:24:24 +01:00
David Taylor	5e9f7e2c63	More prettying	2016-10-06 17:00:45 +01:00
David Taylor	3f752cd7b7	Made embed prettier	2016-10-06 16:48:19 +01:00
David Taylor	25a3ef3f0c	Don't login in new window	2016-10-06 16:15:53 +01:00
David Taylor	1b28efb6af	Allow the embedded login to be embedded (useful feature)	2016-10-06 16:10:51 +01:00
David Taylor	441a2be0b8	Added embedded login, and all iframe links open in new tab	2016-10-06 16:08:01 +01:00
David Taylor	1bdc4bd293	Fixed description = none in embed	2016-10-06 13:22:47 +01:00
David Taylor	f0bb4c5b02	Move exemption to urls.py (cleaner)	2016-10-06 13:13:09 +01:00
David Taylor	4660322964	Remove hardcoded URL	2016-10-06 13:04:33 +01:00
David Taylor	59efc2c485	Fixed JSON	2016-10-06 12:59:37 +01:00
David Taylor	69b0ff9fae	Made embed page, with clickjacking protection turned off	2016-10-06 12:52:33 +01:00
David Taylor	4b94ea7ef2	Made login redirect JS for event detail	2016-10-06 12:02:44 +01:00
David Taylor	0244f5cfca	Restored login security to events	2016-10-05 10:42:49 +01:00
David Taylor	17c7a3c524	Made embed tag use absolute URL	2016-10-05 10:39:50 +01:00
David Taylor	a02087bf2a	Fixed fail	2016-10-04 21:11:43 +01:00
David Taylor	585f909d3f	Escape JSON	2016-10-04 21:05:07 +01:00
David Taylor	eb10c8e21f	Add meta to detail page	2016-10-03 23:13:25 +01:00
David Taylor	f7ea0cb834	Remove security from event detail (for testing in staging)	2016-10-03 23:09:57 +01:00
David Taylor	64f3842a13	Added iframe to embed	2016-10-03 23:02:19 +01:00