Commit Graph

513 Commits

Author SHA1 Message Date
Tom Price
22b5111365 Fix for failing test in e0d56e 2016-03-31 00:09:59 +01:00
Tom Price
e0d56e2a6e Add failing test for markdown processing none 2016-03-31 00:08:56 +01:00
Tom Price
09c3a2d637 Add indications of where MD support is enabled as per comment by @samozzy in #178.
Isn't quite a full description, but for the most part this should be enough for the people who know how to use it see where they can use it.
2016-03-30 23:49:37 +01:00
Tom Price
573b8f9fb5 Merge branch 'master' into markdown
# Conflicts:
#	RIGS/static/css/screen.css
#	db.sqlite3
#	requirements.txt
2016-03-30 23:36:00 +01:00
Tom Price
c6128d9a34 Add tests for markdown support.
Focuses mainly on RML as that's where it will break
2016-03-30 23:31:12 +01:00
davidtaylorhq
f13303490a Merge pull request #211 from nottinghamtec/wercker
Wercker
2016-03-24 12:34:00 +00:00
David Taylor
84b0a57e14 Fixed line breaks for new items. Closes #212 2016-03-24 12:22:37 +00:00
Tom Price
2ee7c064af Add a dirty work around for wercker not quite working correctly. 2016-03-18 16:48:43 +00:00
Tom Price
b2b8546e3c Add test for events_in_bounds 2016-03-18 16:41:13 +00:00
Tom Price
2945a607bf Add more tests for models.Event properties 2016-03-18 16:27:20 +00:00
Tom Price
4370cf60d1 And yet some more waits 2016-03-17 18:44:03 +00:00
Tom Price
e7496a9d82 Add some more waits for animations in failing test 2016-03-17 18:37:15 +00:00
Tom Price
77f7a25fa8 Try maximising firefox so it is large enough to pass the test 2016-03-17 18:06:37 +00:00
Tom Price
10c5ea3e7c Add a wait for the animation to complete during event creation. 2016-03-17 17:47:02 +00:00
David Taylor
f0a3c968a7 Added unicode support 2016-03-16 15:15:12 +00:00
David Taylor
1b6ce32deb Merge branch 'master' into version_history_diff 2016-03-16 14:36:24 +00:00
David Taylor
551737b882 Merge branch 'master' into deleting_duplicates 2016-03-16 13:05:54 +00:00
David Taylor
9bace9a6da Merge branch 'master' into web_calendar 2016-03-16 12:52:57 +00:00
David Taylor
c6b45da72c Made tests more reliable - wait for success page to load before checking item exists in database 2016-03-16 12:49:42 +00:00
David Taylor
0721d61bef Merge branch 'master' into web_calendar 2016-03-16 12:30:22 +00:00
David Taylor
56bc084e60 Made interface more compact 2016-03-16 12:28:37 +00:00
David Taylor
481f56a4bd Added highlighting styles 2016-03-16 12:17:26 +00:00
David Taylor
11e9931438 Fixed compass config 2016-03-16 12:16:57 +00:00
David Taylor
2ed0a4bcf9 Updated changes view to use diff where appropriate. 2016-03-16 10:08:26 +00:00
David Taylor
ed552b402a Based on event with no MIC - closes #163 2016-03-10 11:56:09 +00:00
David Taylor
e3adfecd17 Added database migration 2016-02-29 20:43:11 +00:00
David Taylor
1681ab8fee Allowed linking to specific views/dates on the calendar - closes #153 2016-02-29 20:35:53 +00:00
David Taylor
a77bc65d7b Changed delete condition to SET_NULL - closes #199 2016-02-29 20:12:41 +00:00
David Taylor
73517ed443 Revision history link on non-rigs - closes #186 2016-02-29 19:55:04 +00:00
David Taylor
f59e11ecc4 Updated VAT Registration Number - Closes #197 2016-02-29 19:37:59 +00:00
samozzy
581f28757a Update konami.js
Disable Weirdness Factor 12 on devices without an 'escape' key.
2016-02-01 17:10:06 +00:00
Tom Price
99e1def1bb Improved list handling in RML 2016-01-07 23:56:01 +00:00
Tom Price
7e0e6b6b3e Add parsing of markdown when editing event items 2016-01-07 20:55:21 +00:00
Tom Price
e645b72492 Add MD to rigboard
Reduce MD title sizes as they were offensively large
2016-01-07 20:45:34 +00:00
Tom Price
16519b8763 Improve handling of code blocks in RML 2016-01-07 20:37:03 +00:00
Tom Price
e3117cc399 Remove rml formatting in event_detail 2016-01-07 20:19:13 +00:00
Tom Price
5cecbdbb30 Fix a bug with squares appearing around the last page number 2016-01-07 20:18:42 +00:00
Tom Price
b46023c522 Add OL processing to RML 2016-01-07 20:12:04 +00:00
Tom Price
2d3262cb0b Add processing for <ul> in RML 2016-01-07 20:02:07 +00:00
Tom Price
088e23749d Improved MD support.
Add some styling for images in MD

Add support for the bastardisation of the MD html for RML.
2016-01-07 19:25:54 +00:00
Tom Price
b80c38756f Add basic markdown support site wide 2016-01-07 18:14:10 +00:00
Tom Price
29126a558b Make the captcha Foxtrot Oscar from the functional tests 2016-01-04 23:38:17 +00:00
Tom Price
0a30a99e1f Absolish the captcha from the login page. 2016-01-04 23:37:11 +00:00
Tom Price
b7018d5c44 Refactor NoneType test to make use of the __str__ method thus including that method in the test as well. 2015-12-22 23:07:15 +00:00
Tom Price
48969ed95c Fix NoneType exception by only adding initials if they are set.
Closes #171
2015-12-22 23:03:30 +00:00
Tom Price
b933a5322f Add test to reproduce NoneType exception from #171 2015-12-22 23:01:30 +00:00
Tom Price
2743112f1b Reformat file to correct standard 2015-12-22 22:59:12 +00:00
David Taylor
adf9b8ba75 Merge branch 'admin-users' 2015-10-16 11:44:56 +01:00
Tom Price
0a3a35bf1b Setup useradminform correctly for profiles enabling admins to change passwords. 2015-10-15 13:38:24 +01:00
David Taylor
67dfc4bcab Fixed changing between rig/non-rig 2015-10-11 11:39:49 +01:00