Tom Price
9bbdb9fbe0
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +01:00
Tom Price
4d86125c70
Merged in modal-scroll (pull request #49 )
...
Upgraded modal.js bootstrap plugin. Fixes issue #147
2015-07-29 18:38:06 +01:00
Tom Price
8f688a6a6b
Merged in html-escape (pull request #50 )
...
Escape HTML provided in form - issue #148
2015-07-29 18:31:11 +01:00
Tom Price
f619f83c09
Revert changes in 1fdeed7
2015-07-29 17:59:01 +01:00
Tom Price
5bb7283f2d
Merge branch 'vagrant' into hotfixes
2015-07-23 21:08:44 +01:00
David Taylor
160c43f927
Merge branch 'ui-changes'
2015-07-21 00:19:32 +01:00
David Taylor
a7493d46b5
Updated tests to reflect model changes
2015-07-21 00:17:56 +01:00
David Taylor
41ed0c96a2
Merge branch 'validation'
2015-07-20 22:53:44 +01:00
David Taylor
f08d7ed430
Added functional test for date validation
2015-07-20 22:52:08 +01:00
David Taylor
163c77880b
Merge branch 'vat-rate'
2015-07-20 22:20:14 +01:00
David Taylor
c67eab3479
Escape HTML provided in form - issue #148
2015-07-20 22:02:08 +01:00
David Taylor
6b5693c10a
Upgraded modal.js bootstrap plugin. Fixes issue #147
2015-07-20 21:36:40 +01:00
David Taylor
c4eb855620
Removed id numbers from page titles for person, venue & organisation detail views
2015-07-19 16:25:41 +01:00
David Taylor
5641a998f3
Removed unnecessary variable & updated test
2015-07-19 16:14:40 +01:00
David Taylor
278864c7ea
Added ical tests, and upgraded selenium
2015-06-30 17:11:50 +01:00
David Taylor
8b5d8e6056
Only put params in URL if not default values
2015-06-30 15:05:35 +01:00
David Taylor
507823a26a
Added options to ical interface - issue #80
2015-06-30 14:31:28 +01:00
David Taylor
72bf28da53
Removed special characters from paperwork filenames - issue #103
2015-06-29 23:27:10 +01:00
David Taylor
6862bb5721
Added start/end date validation for events
2015-06-29 22:16:50 +01:00
David Taylor
3634c7c1e4
Streamlined ical logic, and fixed #75 , again
2015-06-29 21:19:18 +01:00
David Taylor
8450c36971
Fixed some #timezoneIssues
2015-06-29 21:07:10 +01:00
David Taylor
90ed1c9c1d
Added additional selectors to events_in_bounds
2015-06-29 20:28:09 +01:00
David Taylor
68e624f460
Streamlined web-calendar logic, also fixed issue #94
2015-06-29 20:25:46 +01:00
David Taylor
c27960456e
Merge branch 'hotfixes' into web-calendar
2015-06-29 19:40:01 +01:00
David Taylor
6b40123f63
Added earliest_time property to event
2015-06-29 19:39:24 +01:00
David Taylor
3c21355375
Rewrote web calendar UI to have bootstrap interface. Also has go-to-date function - issue #109
2015-06-29 17:38:47 +01:00
David Taylor
d3c6dab29b
Improved how events are selected for display on web-calendar
2015-06-29 14:42:53 +01:00
David Taylor
cc22392ef7
Added estimated VAT, as per issue #71
2015-06-29 13:51:37 +01:00
David Taylor
16e088c155
Removed maxheight of event description
...
(Stops text getting squished when the description is long)
2015-06-29 13:10:55 +01:00
David Taylor
be698d7899
Added bottom swoosh & swoosh to subsequent pages
2015-06-29 13:09:35 +01:00
David Taylor
ddb6bade0e
Changed Terms of hire wording - Issue #111
2015-06-29 12:57:12 +01:00
David Taylor
0089c7d36f
Fixed TZ issue #146
...
(MomentJS wasn't being supplied with timezone info)
2015-06-29 12:09:31 +01:00
David Taylor
616c9b9e75
Rewrote venue detail UI, and added 3-phase to detail & forms
2015-06-29 02:52:39 +01:00
David Taylor
4c07298e5e
Rewrote UI for person and organisation detail pages - now matches design of event_detail and is generally much prettier. Also happens to fix issue #6
2015-06-29 02:25:53 +01:00
David Taylor
c6e442b422
Fixed date formatting issue #141
2015-06-29 00:44:34 +01:00
David Taylor
44c1704f75
Paperwork emergency contacts "or" to "and"
2015-06-28 23:29:06 +01:00
David Taylor
1fdeed7da3
Added dry hire indicator to event_detail - issue #144
2015-06-28 23:26:02 +01:00
David Taylor
73ba535efb
Fixed API permissions, and removed unnecessary data from the events api (it now only gives information available to non-keyholders - the rest wasn't used anyway).
...
This now means the web-calendar view works for non-keyholders
2015-06-28 22:54:58 +01:00
David Taylor
a0467300e3
Fixed ordering of event archive
2015-06-28 20:46:15 +01:00
David Taylor
8ee76a9a75
Fixed testEventDetail
2015-06-28 19:02:18 +01:00
David Taylor
65a8b43dbf
Fix testRigCreate (wait for animations)
2015-06-28 18:44:32 +01:00
David Taylor
e96b36e533
Fixed registration test
2015-06-28 16:40:22 +01:00
Tom Price
6b2df1b9f4
TestEventDetail does not work.
...
Changd name to prevent it from running a full suite of tests.
The issue appears to be with trying to access events without a
reversion history for that sepecific event.
2015-06-04 07:04:01 +01:00
Tom Price
8666dcc9a4
Start work on an EventDetail test
2015-06-04 06:42:01 +01:00
Tom Price
abdbad14d6
Add using the pk of the event rather than a static for atomicity when running other tests.
2015-06-04 06:30:47 +01:00
Tom Price
6180fdf7a4
Finish testing the remaining parts of adding an event
2015-06-04 06:26:43 +01:00
Tom Price
1f6e624cd9
Add small value checks, saving and checking error is displayed correctly.
2015-06-04 06:00:11 +01:00
Tom Price
e132bb2b9d
Enable checking newly added item has worked
2015-06-04 05:40:41 +01:00
Tom Price
92795754b1
Enable adding an event item
2015-06-04 05:08:14 +01:00
Tom Price
85e827cd51
Add organisation, venue, start/end date/time
2015-06-02 00:48:00 +01:00
