Commit Graph

  • 000a7adfa2 Add script adding a person to test rig Tom Price 2015-06-01 01:13:14 +01:00
  • 14559f488b Add script adding a person to test rig Tom Price 2015-06-01 01:13:14 +01:00
  • 812fdbc3f1 Complete rigboard test. Add basic story for RigCreate Add start of RigCreate Tom Price 2015-06-01 00:38:39 +01:00
  • 64462778d5 Complete rigboard test. Add basic story for RigCreate Add start of RigCreate Tom Price 2015-06-01 00:38:39 +01:00
  • 4c2a181a33 Add event logic Tom Price 2015-06-01 00:03:59 +01:00
  • c641a6649a Add event logic Tom Price 2015-06-01 00:03:59 +01:00
  • b5910fb314 Workaround for captcha being hidden. Updated to a few new changes Tom Price 2015-05-31 23:43:11 +01:00
  • e3a4244674 Workaround for captcha being hidden. Updated to a few new changes Tom Price 2015-05-31 23:43:11 +01:00
  • 5fae10294b Merge branch 'hotfixes' into testing Tom Price 2015-05-31 23:30:35 +01:00
  • 463f421fd2 Merge branch 'hotfixes' into testing Tom Price 2015-05-31 23:30:35 +01:00
  • 7aa6c05f96 Add missing username field *facepalms* Tom Price 2015-05-31 23:30:09 +01:00
  • 5ea9ba20ab Add missing username field *facepalms* Tom Price 2015-05-31 23:30:09 +01:00
  • ff304ef84e Add logic needed for captcha checking Tom Price 2015-05-31 23:24:28 +01:00
  • 576f054ab1 Add logic needed for captcha checking Tom Price 2015-05-31 23:24:28 +01:00
  • 9c06f9f9f9 Remove uneeded linebreaks to make it easier to trace what is going on. Tom Price 2015-05-31 23:04:59 +01:00
  • b92b1bdf78 Remove uneeded linebreaks to make it easier to trace what is going on. Tom Price 2015-05-31 23:04:59 +01:00
  • ce0ac7f44b Add missing dry hire 11. Tom Price 2015-05-31 23:04:29 +01:00
  • f90191a53e Add missing dry hire 11. Tom Price 2015-05-31 23:04:29 +01:00
  • ec424f2db3 Fix for incorrect logic in current dry hires Tom Price 2015-05-31 23:01:52 +01:00
  • 37fe98b801 Fix for incorrect logic in current dry hires Tom Price 2015-05-31 23:01:52 +01:00
  • e2b352557c Change the way current events are tested Tom Price 2015-05-31 22:57:17 +01:00
  • 381f646f8e Change the way current events are tested Tom Price 2015-05-31 22:57:17 +01:00
  • f8e17da645 Merge master into testing Tom Price 2015-05-31 22:37:20 +01:00
  • 4d93e05257 Merge master into testing Tom Price 2015-05-31 22:37:20 +01:00
  • a8331261f0 Merged in hotfixes (pull request #42) Tom Price 2015-05-31 16:35:06 +01:00
  • 6e62f3da48 Merged in hotfixes (pull request #42) Tom Price 2015-05-31 16:35:06 +01:00
  • 0bc97e1705 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-31 16:31:57 +01:00
  • 64e2402ede Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-31 16:31:57 +01:00
  • 6bfcbeb8aa Fix for #140 Tom Price 2015-05-31 16:31:38 +01:00
  • ec0e9652d5 Fix for #140 Tom Price 2015-05-31 16:31:38 +01:00
  • f42628d23f Fixed too many save buttons #99 David Taylor 2015-05-29 17:00:59 +01:00
  • 1a24897411 Fixed too many save buttons #99 David Taylor 2015-05-29 17:00:59 +01:00
  • 2da8980be4 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields Tom Price 2015-05-29 15:59:08 +01:00
  • 82ea08ad51 Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields Tom Price 2015-05-29 15:59:08 +01:00
  • 0f2733c2f1 Merge branch 'hotfixes' Tom Price 2015-05-29 15:48:29 +01:00
  • fea986dc91 Merge branch 'hotfixes' Tom Price 2015-05-29 15:48:29 +01:00
  • 3dc82e2de7 Add missing explicit fields definition django 1.8 realted Tom Price 2015-05-29 15:45:14 +01:00
  • 8345ab3228 Add missing explicit fields definition django 1.8 realted Tom Price 2015-05-29 15:45:14 +01:00
  • bc14c0e33e Fix for changes to sum function Tom Price 2015-05-29 15:42:57 +01:00
  • 2899c684ac Fix for changes to sum function Tom Price 2015-05-29 15:42:57 +01:00
  • 8ed299f23f Fix for events without an MIC causing 500 errors for people with permission to view profiles. Tom Price 2015-05-29 15:20:29 +01:00
  • c867ce49ef Fix for events without an MIC causing 500 errors for people with permission to view profiles. Tom Price 2015-05-29 15:20:29 +01:00
  • 187ba9113e Merge branch 'hotfixes' Tom Price 2015-05-29 02:06:58 +01:00
  • 9fc5555a00 Merge branch 'hotfixes' Tom Price 2015-05-29 02:06:58 +01:00
  • e8e2178e49 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 02:02:33 +01:00
  • 86b570e3e8 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 02:02:33 +01:00
  • 713197b986 Change to using manifest static files as a cachebuster. Tom Price 2015-05-29 02:02:23 +01:00
  • ba66a418d0 Change to using manifest static files as a cachebuster. Tom Price 2015-05-29 02:02:23 +01:00
  • c6d15c5fca Fixed impending static files fail David Taylor 2015-05-29 02:02:11 +01:00
  • 4b5d55c840 Fixed impending static files fail David Taylor 2015-05-29 02:02:11 +01:00
  • 4846d858aa Prevent modal inception Tom Price 2015-05-29 01:46:12 +01:00
  • 9063a5d0f7 Prevent modal inception Tom Price 2015-05-29 01:46:12 +01:00
  • ac106ef864 Add links to user page in events Tom Price 2015-05-29 01:32:07 +01:00
  • e0f80c38fc Add links to user page in events Tom Price 2015-05-29 01:32:07 +01:00
  • be7fe9ee9b Added profile Modals & links from activity feed David Taylor 2015-05-29 01:28:36 +01:00
  • 346ee19862 Added profile Modals & links from activity feed David Taylor 2015-05-29 01:28:36 +01:00
  • a2bba0895b Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 01:17:30 +01:00
  • d556ebabc4 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes Tom Price 2015-05-29 01:17:30 +01:00
  • a1591004d7 Increase contrast in navbar Tom Price 2015-05-29 00:57:04 +01:00
  • fff913fffe Increase contrast in navbar Tom Price 2015-05-29 00:57:04 +01:00
  • 7da332ed9d Added days of week David Taylor 2015-05-29 00:38:00 +01:00
  • 3b6e905881 Added days of week David Taylor 2015-05-29 00:38:00 +01:00
  • e684ee0b2d Stop emails falling of the end of the world #122 Tom Price 2015-05-29 00:36:47 +01:00
  • 622b44d5ba Stop emails falling of the end of the world #122 Tom Price 2015-05-29 00:36:47 +01:00
  • e72b76f972 Add item description class for indents on new items. Tom Price 2015-05-29 00:29:12 +01:00
  • 252d48a3e1 Add item description class for indents on new items. Tom Price 2015-05-29 00:29:12 +01:00
  • ca3cae4af8 Change 'Collected by' to lowercase so it shows up correctly in the activity feed Tom Price 2015-05-29 00:19:25 +01:00
  • 3f373d807a Change 'Collected by' to lowercase so it shows up correctly in the activity feed Tom Price 2015-05-29 00:19:25 +01:00
  • cb0151fd23 Change profile to use the correct user display name. Tom Price 2015-05-29 00:12:26 +01:00
  • e3e1bf6892 Change profile to use the correct user display name. Tom Price 2015-05-29 00:12:26 +01:00
  • d5fac0d146 Add translating choice fields to correct values. Tom Price 2015-05-29 00:06:06 +01:00
  • e37431dddc Add translating choice fields to correct values. Tom Price 2015-05-29 00:06:06 +01:00
  • 480cd0b820 Add appropriate linebreaks #130. Tom Price 2015-05-28 23:38:20 +01:00
  • 7dd9dd021e Add appropriate linebreaks #130. Tom Price 2015-05-28 23:38:20 +01:00
  • ab905d8063 Change line about PyRIGS #127 Tom Price 2015-05-28 23:34:11 +01:00
  • c4715df341 Change line about PyRIGS #127 Tom Price 2015-05-28 23:34:11 +01:00
  • e14ce1424e Add note about contracts not being invoices. Tom Price 2015-05-28 23:33:05 +01:00
  • 7fd1bc6e7c Add note about contracts not being invoices. Tom Price 2015-05-28 23:33:05 +01:00
  • 6f84b8ecc1 Merge branch 'django-update' Tom Price 2015-05-28 23:02:59 +01:00
  • 390a15c56e Merge branch 'django-update' Tom Price 2015-05-28 23:02:59 +01:00
  • 585c47b38c Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update Tom Price 2015-05-28 22:59:19 +01:00
  • b1ed77b235 Merge branch 'django-update' of bitbucket.org:nottinghamtec/pyrigs into django-update Tom Price 2015-05-28 22:59:19 +01:00
  • 6763f371d4 Workaround for context bug David Taylor 2015-05-28 22:41:02 +01:00
  • 5802696229 Workaround for context bug David Taylor 2015-05-28 22:41:02 +01:00
  • 7310c8fe3a Fix import error changed in Django 1.8 Tom Price 2015-05-28 22:28:01 +01:00
  • e9bbf08c87 Fix import error changed in Django 1.8 Tom Price 2015-05-28 22:28:01 +01:00
  • 148bf399ca Added explicit field declarations to edit & update views David Taylor 2015-05-28 22:20:48 +01:00
  • 3d6d19ffd9 Added explicit field declarations to edit & update views David Taylor 2015-05-28 22:20:48 +01:00
  • 85f9801f23 Remove MySQL import Tom Price 2015-05-28 20:57:48 +01:00
  • 894234f167 Remove MySQL import Tom Price 2015-05-28 20:57:48 +01:00
  • 67d0d755f7 Removed static widget_tweaks and added to requirements David Taylor 2015-05-28 20:20:59 +01:00
  • a0569ae4bc Removed static widget_tweaks and added to requirements David Taylor 2015-05-28 20:20:59 +01:00
  • ceae2acf61 Removed url import all-together David Taylor 2015-05-28 20:17:58 +01:00
  • 02601bed9d Removed url import all-together David Taylor 2015-05-28 20:17:58 +01:00
  • f78ce621d5 Removed "from future" for url imports David Taylor 2015-05-28 20:07:45 +01:00
  • 5a47851ddb Removed "from future" for url imports David Taylor 2015-05-28 20:07:45 +01:00
  • cbe49fc9dd Scrap that - bad idea! David Taylor 2015-05-28 20:00:46 +01:00
  • 6754064ebc Scrap that - bad idea! David Taylor 2015-05-28 20:00:46 +01:00
  • 284604e4a4 Explicitly imported django.contrib.sites David Taylor 2015-05-28 19:48:20 +01:00
  • e8c2589790 Explicitly imported django.contrib.sites David Taylor 2015-05-28 19:48:20 +01:00