arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 22:42:17 +00:00
Code Issues Projects Releases Wiki Activity
1,365 Commits 55 Branches 0 Tags
7f84c1de41dca3a2d8f2955bb701c84c8e1b0964
Commit Graph

1365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Price
e699826ce9 Merge branch 'master' into fixed_jquery 2016-03-17 17:10:35 +00:00
David Taylor
33fa19c15e Merge branch 'version_history_diff', second time lucky 2016-03-16 15:21:53 +00:00
David Taylor
d6e9b030fd Merge branch 'master' into version_history_diff 2016-03-16 15:21:13 +00:00
David Taylor
f0a3c968a7 Added unicode support 2016-03-16 15:15:12 +00:00
David Taylor
d8760a00ba Revert "Merge branch 'version_history_diff'" 
This reverts commit 8ee43ef3ab, reversing
changes made to 9964d33cc0.
 2016-03-16 14:54:09 +00:00
David Taylor
8ee43ef3ab Merge branch 'version_history_diff' 2016-03-16 14:37:09 +00:00
David Taylor
1b6ce32deb Merge branch 'master' into version_history_diff 2016-03-16 14:36:24 +00:00
Tom Price
9964d33cc0 Update wercker in README.md 
[ci skip]
 2016-03-16 14:32:38 +00:00
David Taylor
1e81b718f6 Merge branch 'deleting_duplicates' 2016-03-16 13:09:02 +00:00
David Taylor
551737b882 Merge branch 'master' into deleting_duplicates 2016-03-16 13:05:54 +00:00
David Taylor
77dd36d4b4 Merge branch 'web_calendar' 2016-03-16 12:55:26 +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
ea840eb43c Added diff-match-patch to requirements 2016-03-16 12:08:41 +00:00
David Taylor
2ed0a4bcf9 Updated changes view to use diff where appropriate. 2016-03-16 10:08:26 +00:00
Harry Bridge
5d48d75f34 Make protocol-agnostic 2016-03-12 18:17:03 +00:00
Harry Bridge
92beb8bf79 Fixed jquery version 2016-03-12 18:12:39 +00:00
David Taylor
ed552b402a Based on event with no MIC - closes #163 2016-03-10 11:56:09 +00:00
David Taylor
8279bec4bf Removed warning message at top - closes #203 2016-03-10 11:46:28 +00:00
David Taylor
67b2bc6d54 Applied migration to development database 2016-02-29 20:44: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
Tom Price
19f619b2d4 Merge pull request #194 from nottinghamtec/login-autofocus 
Made username field autofocus (using HTML5 Attribute). Fixes #193
 2016-02-12 16:46:10 +00:00
David Taylor
e0d03c2cc3 Made username field autofocus (using HTML5 Attribute). Fixes #193 2016-02-12 16:27:11 +00:00
Tom Price
69f7152dd6 Merge pull request #191 from samozzy/patch-1 
Update konami.js
 2016-02-01 17:11:20 +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
660a54d955 Merge pull request #177 from nottinghamtec/login 
Move captcha from login screen.

Close #176
 2016-01-20 13:45:26 +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