Commit Graph

570 Commits

Author SHA1 Message Date
Tom Price
3f373d807a Change 'Collected by' to lowercase so it shows up correctly in the activity feed
Incidently, this is corrected by forms to have sentence case.
2015-05-29 00:19:25 +01:00
Tom Price
e3e1bf6892 Change profile to use the correct user display name. 2015-05-29 00:12:26 +01:00
Tom Price
e37431dddc Add translating choice fields to correct values. 2015-05-29 00:06:06 +01:00
Tom Price
7dd9dd021e 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
c4715df341 Change line about PyRIGS #127 2015-05-28 23:34:11 +01:00
Tom Price
7fd1bc6e7c Add note about contracts not being invoices. 2015-05-28 23:33:05 +01:00
Tom Price
390a15c56e Merge branch 'django-update' 2015-05-28 23:02:59 +01:00
Tom Price
b1ed77b235 Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update 2015-05-28 22:59:19 +01:00
David Taylor
5802696229 Workaround for context bug 2015-05-28 22:41:02 +01:00
Tom Price
e9bbf08c87 Fix import error changed in Django 1.8 2015-05-28 22:28:01 +01:00
David Taylor
3d6d19ffd9 Added explicit field declarations to edit & update views 2015-05-28 22:20:48 +01:00
Tom Price
894234f167 Remove MySQL import
This was legacy and isn't needed any more.
2015-05-28 21:44:59 +01:00
David Taylor
a0569ae4bc Removed static widget_tweaks and added to requirements 2015-05-28 20:20:59 +01:00
David Taylor
02601bed9d Removed url import all-together 2015-05-28 20:17:58 +01:00
David Taylor
5a47851ddb Removed "from future" for url imports 2015-05-28 20:07:45 +01:00
David Taylor
6754064ebc Scrap that - bad idea! 2015-05-28 20:00:46 +01:00
David Taylor
e8c2589790 Explicitly imported django.contrib.sites 2015-05-28 19:48:20 +01:00
David Taylor
271e52ea80 Explicitly set redirect view permanent/temporary 2015-05-28 19:42:05 +01:00
David Taylor
e610e28c35 Removed unnecessary select_related 2015-05-28 19:36:30 +01:00
David Taylor
16b2b71979 Remove legacy database 2015-05-28 19:32:05 +01:00
David Taylor
335b815cc8 Updated requirements 2015-05-28 17:03:27 +01:00
David Taylor
26c074c302 Fixed moronity 2015-05-28 16:26:27 +01:00
David Taylor
cc40aeef42 Added easter egg event tracking 2015-05-28 16:21:47 +01:00
David Taylor
8c6199ea2d Implemented project ship 2015-05-27 02:36:30 +01:00
Tom Price
19aef5f204 Fix merge fail. DAVID! 2015-05-26 17:57:43 +01:00
David Taylor
3596f67a40 Add invoice menu icons 2015-05-26 15:47:39 +01:00
David Taylor
0e1237c67e Merge branch 'revision-view' into hotfixes 2015-05-26 15:45:09 +01:00
David Taylor
d0f3dc4bec Moved grouping logic to view, and added time to stream 2015-05-26 04:34:23 +01:00
David Taylor
83a4b414ad Animated loading 2015-05-26 03:43:35 +01:00
David Taylor
a836a2f1c8 Added various permission checks for links 2015-05-26 03:17:20 +01:00
Tom Price
8714d4d24c 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
314111d6bd Change list-groups to be surrounded by pannels 2015-05-26 00:51:11 +01:00
Tom Price
25f301bc8f Change to using SCSS instead of inline CSS 2015-05-26 00:40:45 +01:00
Tom Price
d7d2a647d7 Remove nsbp 2015-05-26 00:20:57 +01:00
Tom Price
644c12bc55 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
155eb29dfa Remove uneeded comma. Nathan will probably clarify this. 2015-05-26 00:08:21 +01:00
Tom Price
1d9eddfe6d 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
7539b40259 Change to select and order more accurately
Select by revision and order by revision date
2015-05-26 00:01:23 +01:00
Tom Price
b4a237b3cd Move activity loading into the feed file to be more semantic 2015-05-26 00:00:40 +01:00
Tom Price
bc2db608fb Improve grouping with correct spacing 2015-05-25 23:37:08 +01:00
Tom Price
d7de69abfc Redesigned activity feed to "group" by user 2015-05-25 23:31:39 +01:00
Tom Price
60d418ef19 Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view 2015-05-25 22:34:40 +01:00
Tom Price
b7c1853bff Add block tags to make it more semantic 2015-05-25 22:31:36 +01:00
David Taylor
a8ee56c4f5 Fixed fail (removed unnecessary css) 2015-05-25 22:20:50 +01:00
Tom Price
d92462324b Merge branch 'master' into revision-view 2015-05-25 22:13:33 +01:00
Tom Price
aa648412a1 Merged in timezone-fixes (pull request #40)
Timezone Fixes
2015-05-25 22:06:20 +01:00
David Taylor
c6037c44ce Fixed MIC photo logic 2015-05-24 14:21:24 +01:00
David Taylor
faedce316c More UI Improvements 2015-05-24 12:54:29 +01:00
David Taylor
82041d413c Merge branch 'master' into revision-view 2015-05-24 12:24:21 +01:00
David Taylor
641c065bd6 Uncommented captcha 2015-05-24 12:14:43 +01:00