David Taylor
c36a90ba37
Added a day to end dates, if there is no end time (ical and fullcalendar.js use non-inclusive end dates). Issue #154
2015-08-16 21:06:32 +01:00
Tom Price
9bbdb9fbe0
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +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
163c77880b
Merge branch 'vat-rate'
2015-07-20 22:20:14 +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
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
8450c36971
Fixed some #timezoneIssues
2015-06-29 21:07:10 +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
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
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
f42628d23f
Fixed too many save buttons #99
2015-05-29 17:00:59 +01:00
Tom Price
8ed299f23f
Fix for events without an MIC causing 500 errors for people with permission to view profiles.
2015-05-29 15:20:29 +01:00
Tom Price
ac106ef864
Add links to user page in events
2015-05-29 01:32:07 +01:00
David Taylor
be7fe9ee9b
Added profile Modals & links from activity feed
2015-05-29 01:28:36 +01:00
David Taylor
7da332ed9d
Added days of week
2015-05-29 00:38:00 +01:00
Tom Price
e684ee0b2d
Stop emails falling of the end of the world #122
2015-05-29 00:36:47 +01:00
Tom Price
e72b76f972
Add item description class for indents on new items.
2015-05-29 00:29:12 +01:00
Tom Price
480cd0b820
Add appropriate linebreaks #130 .
...
Issue #130 details how it is only in notes. Inadvertantly, this has also been fixed for item descriptions.
2015-05-28 23:38:20 +01:00
Tom Price
ab905d8063
Change line about PyRIGS #127
2015-05-28 23:34:11 +01:00
Tom Price
e14ce1424e
Add note about contracts not being invoices.
2015-05-28 23:33:05 +01:00
Tom Price
bb0a5e4b1e
Fix merge fail. DAVID!
2015-05-26 17:57:43 +01:00
David Taylor
749e5a4289
Merge branch 'revision-view' into hotfixes
2015-05-26 15:45:09 +01:00
David Taylor
4d76786f28
Moved grouping logic to view, and added time to stream
2015-05-26 04:34:23 +01:00
David Taylor
e70b2bdd74
Animated loading
2015-05-26 03:43:35 +01:00
David Taylor
67f8ae9fc7
Added various permission checks for links
2015-05-26 03:17:20 +01:00
Tom Price
c844fe8b34
Add loading animation to recent changes feed.
...
This is quite a quick spinner, not sure it really fits with the themeing,
but worth experimenting with anyway.
2015-05-26 01:09:19 +01:00
Tom Price
faa04bccc8
Change list-groups to be surrounded by pannels
2015-05-26 00:51:11 +01:00
Tom Price
6d1feec59b
Change to using SCSS instead of inline CSS
2015-05-26 00:40:45 +01:00
Tom Price
57bd1b75c0
Remove nsbp
2015-05-26 00:20:57 +01:00
Tom Price
1eb7ea1181
Move selection logic from template to view
...
Required adding some extra data to the dict directly.
In theory this should produce better performance.
2015-05-26 00:20:09 +01:00
Tom Price
a866aaa148
Remove uneeded comma. Nathan will probably clarify this.
2015-05-26 00:08:21 +01:00
Tom Price
84b74d373f
Removed scrolling from activity.
...
With the changed UI, I don't think this is as needed.
Can control the height better by limiting the number of changes shown.
For more info, see how bitbucket do this.
2015-05-26 00:05:28 +01:00
Tom Price
16ccf9c116
Move activity loading into the feed file to be more semantic
2015-05-26 00:00:40 +01:00
Tom Price
3d44633554
Improve grouping with correct spacing
2015-05-25 23:37:08 +01:00
Tom Price
ac7690bdf1
Redesigned activity feed to "group" by user
2015-05-25 23:31:39 +01:00
Tom Price
d4256b1c8b
Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view
2015-05-25 22:34:40 +01:00
