David Taylor
000351d884
Redirect all requests to https
2016-05-28 15:20:15 +01:00
David Taylor
db58c113aa
Changed font to load over https - #236
2016-05-28 14:52:48 +01:00
Tom Price
7cb8503164
Merged feature/invoice-total into develop
2016-05-24 18:44:27 +01:00
Tom Price
cc2450ff87
Make total conditional if defined
2016-05-24 17:50:48 +01:00
Tom Price
6b77393414
Fix for incorrect selection of active invoices.
...
Make sure waiting shows total across all pages.
2016-05-24 17:49:44 +01:00
Tom Price
7ccc8faf20
Add total for waiting events
2016-05-24 17:32:58 +01:00
Tom Price
6030288956
Cheap and dirty active totals
2016-05-24 17:17:52 +01:00
Tom Price
e4a955f323
Reformat code to PEP8
2016-05-23 12:36:21 +01:00
Tom Price
e286d8bdee
Merge pull request #229 from nottinghamtec/develop
2016-05-23 00:38:31 +01:00
David Taylor
1faf8f95c8
Fixed colour coding on invoice waiting page
2016-05-22 23:13:23 +01:00
Tom Price
2913b254b4
Fix an overflow issue with dropdown fields. Closes #204
2016-05-19 14:33:33 +01:00
Tom Price
ef81536066
Add tooltips to rig type selectors. Closes #227
2016-05-19 14:21:21 +01:00
David Taylor
29aa13316d
Fix for versioning when event has been deleted, closes #226
2016-04-27 20:49:42 +01:00
David Taylor
98f28aaafd
Based on has name as well as MIC - Fix #224
2016-04-12 20:15:13 +01:00
David Taylor
f8a2a7a959
Made items display in version history again
2016-04-07 09:23:35 +01:00
David Taylor
767b5512e3
Fail, missed a change, actually closes #185 now
2016-04-07 00:53:57 +01:00
David Taylor
f1bd1ca674
Make 'created' noun class-specific. Closes #185
2016-04-07 00:52:33 +01:00
David Taylor
b47cfed5a9
Fixed versioning UI for revisions containing multiple event versions, hopefully
2016-04-07 00:19:18 +01:00
davidtaylorhq
71b69aa0f6
Merge pull request #220 from nottinghamtec/merge-interface
...
Merge interface
2016-04-06 22:08:32 +01:00
Tom Price
df61225b73
Optimise imports
...
So many unused imports, these have been banished
2016-04-06 21:57:54 +01:00
Tom Price
823db68a6a
PEP8 format files
2016-04-06 21:53:38 +01:00
Tom Price
ebe08c3bf1
Update tests to check items that aren't selected aren't affected.
...
PEP8 format the file
2016-04-06 21:52:25 +01:00
David Taylor
44ccead0a4
Added merge tests
...
I feel like it should be possible to abstract some of these so that they're not copied out for each model, but not sure how to go about it...
2016-04-05 15:32:13 +01:00
David Taylor
99dfdcd253
Make confirmation more useful
2016-04-05 12:53:04 +01:00
David Taylor
03ca65602f
Allow sorting by number of events
2016-04-05 12:08:19 +01:00
David Taylor
ca6cddb392
Add comments display to versioning history (because why not).
...
Maybe in future we could have a box people can type in before they save changes to an event... But that's a separate project
2016-04-05 11:50:34 +01:00
David Taylor
33ce4b622d
Fixed bug with versioning interface when related objects are deleted
2016-04-05 04:18:53 +01:00
David Taylor
46434977fb
Created merge admin action for Person, Venue and Organisation models. Added template.
2016-04-05 04:18:19 +01:00
David Taylor
e2e7f5845a
Made RML bullets pretty :)
2016-03-31 00:44:47 +01:00
Tom Price
f8243f89b3
Enable GH flavour linebreaks in JS rendered markdown
2016-03-31 00:29:58 +01:00
Tom Price
1773eb810f
Enable line break extension for single breaks in paragraphs by new lines.
...
Pass tests in ef3de607c3
2016-03-31 00:18:20 +01:00
Tom Price
ef3de607c3
Add failing test for using single line breaks as per comment on #214
2016-03-31 00:16:49 +01:00
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
Tom Price
cd82712742
Merge pull request #207 from nottinghamtec/fixed_jquery
...
Fixed jquery version.
Closes #192
2016-03-17 17:34:58 +00:00
Tom Price
3067dcdda5
Update wercker in README.md
...
Only show builds from master
[ci skip]
2016-03-17 17:31:14 +00:00
Tom Price
94679d6783
Update seleium version for Wercker
2016-03-17 17:23:21 +00:00
Tom Price
54dc29b4b2
Switch to jquery CDN who provide a sha256 hash to validate against.
...
Advise is now to always use HTTPS for libraries as somebody else manages the certificate it will always validate and it makes sure that a large target doesn't get subject to MITM attack.
2016-03-17 17:18:42 +00:00
