David Taylor
a725ef5caf
Removed add to google calendar link, closes #237
2016-05-29 17:09:52 +01:00
David Taylor
aa79f3628e
Only redirect to HTTPS in production
2016-05-28 15:27:38 +01:00
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
02c615a08c
Fixed for event items. Will probably fail tests because selenium can't type in simpleMDE :(
2016-04-02 02:42:37 +01:00
Tom Price
8cfda69717
Set wercker up to use postgres for tests again.
...
Modify the tests to be postgres compatible by using more pointers to things rather than getting them everytime.
2016-03-31 16:03:07 +01:00
Tom Price
463c4d147c
Update settings for django10 support
...
Allow env.EMAIL_PORT to be None without error
Change template context preprocessor in favour of the new syntax.
2016-03-31 15:14:54 +01:00
Tom Price
6da688cc9e
Migrate VAT rate to use a single date field rather than datetime.
...
There is never any need to track the time as VAT rate hardly ever changes and will always do so at midnight. We were already assuming this anyway but it was generating loads of warnings/errors.
This will break your local VAT rate database if using sqlite, but it is tested with postgres and works fine.
2016-03-31 13:15:53 +01:00
Tom Price
c1d164bd73
Remove the db.sqlite3 file
...
This was loooong overdue
2016-03-31 13:12:35 +01:00
Tom Price
d43e4b2465
Update settings and urls to fix new deprecations
2016-03-31 12:33:46 +01:00
Tom Price
98ee9bb0db
Fix imports in tests
2016-03-31 12:13:11 +01:00
Tom Price
cd2aed00d7
Update login URL in settings so redirects work correctly.
2016-03-31 12:09:04 +01:00
Tom Price
0ee37b1cd3
Fix issues with python2 imports
2016-03-31 12:07:07 +01:00
Tom Price
486c66b198
Update requirements.txt before starting to test for issues
2016-03-31 11:59:21 +01:00
David Taylor
1b4cc91ec8
Added WYSIWYG editor. Works for notes & description, fails miserably for items :(
2016-03-31 01:23:58 +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
