Commit Graph

  • bb0a5e4b1e Fix merge fail. DAVID! Tom Price 2015-05-26 17:57:43 +01:00
  • 19aef5f204 Fix merge fail. DAVID! Tom Price 2015-05-26 17:57:43 +01:00
  • 1e61d760fa Add invoice menu icons David Taylor 2015-05-26 15:47:39 +01:00
  • 3596f67a40 Add invoice menu icons David Taylor 2015-05-26 15:47:39 +01:00
  • 749e5a4289 Merge branch 'revision-view' into hotfixes David Taylor 2015-05-26 15:45:09 +01:00
  • 0e1237c67e Merge branch 'revision-view' into hotfixes David Taylor 2015-05-26 15:45:09 +01:00
  • 4d76786f28 Moved grouping logic to view, and added time to stream David Taylor 2015-05-26 04:34:23 +01:00
  • d0f3dc4bec Moved grouping logic to view, and added time to stream David Taylor 2015-05-26 04:34:23 +01:00
  • e70b2bdd74 Animated loading David Taylor 2015-05-26 03:43:35 +01:00
  • 83a4b414ad Animated loading David Taylor 2015-05-26 03:43:35 +01:00
  • 67f8ae9fc7 Added various permission checks for links David Taylor 2015-05-26 03:17:20 +01:00
  • a836a2f1c8 Added various permission checks for links David Taylor 2015-05-26 03:17:20 +01:00
  • c844fe8b34 Add loading animation to recent changes feed. Tom Price 2015-05-26 01:09:19 +01:00
  • 8714d4d24c Add loading animation to recent changes feed. Tom Price 2015-05-26 01:09:19 +01:00
  • faa04bccc8 Change list-groups to be surrounded by pannels Tom Price 2015-05-26 00:51:11 +01:00
  • 314111d6bd Change list-groups to be surrounded by pannels Tom Price 2015-05-26 00:51:11 +01:00
  • 6d1feec59b Change to using SCSS instead of inline CSS Tom Price 2015-05-26 00:40:45 +01:00
  • 25f301bc8f Change to using SCSS instead of inline CSS Tom Price 2015-05-26 00:40:45 +01:00
  • 57bd1b75c0 Remove nsbp Tom Price 2015-05-26 00:20:57 +01:00
  • d7d2a647d7 Remove nsbp Tom Price 2015-05-26 00:20:57 +01:00
  • 1eb7ea1181 Move selection logic from template to view Tom Price 2015-05-26 00:20:09 +01:00
  • 644c12bc55 Move selection logic from template to view Tom Price 2015-05-26 00:20:09 +01:00
  • a866aaa148 Remove uneeded comma. Nathan will probably clarify this. Tom Price 2015-05-26 00:08:21 +01:00
  • 155eb29dfa Remove uneeded comma. Nathan will probably clarify this. Tom Price 2015-05-26 00:08:21 +01:00
  • 84b74d373f Removed scrolling from activity. Tom Price 2015-05-26 00:05:28 +01:00
  • 1d9eddfe6d Removed scrolling from activity. Tom Price 2015-05-26 00:05:28 +01:00
  • 229138723b Change to select and order more accurately Tom Price 2015-05-26 00:01:23 +01:00
  • 7539b40259 Change to select and order more accurately Tom Price 2015-05-26 00:01:23 +01:00
  • 16ccf9c116 Move activity loading into the feed file to be more semantic Tom Price 2015-05-26 00:00:40 +01:00
  • b4a237b3cd Move activity loading into the feed file to be more semantic Tom Price 2015-05-26 00:00:40 +01:00
  • 3d44633554 Improve grouping with correct spacing Tom Price 2015-05-25 23:36:36 +01:00
  • bc2db608fb Improve grouping with correct spacing Tom Price 2015-05-25 23:36:36 +01:00
  • ac7690bdf1 Redesigned activity feed to "group" by user Tom Price 2015-05-25 23:31:39 +01:00
  • d7de69abfc Redesigned activity feed to "group" by user Tom Price 2015-05-25 23:31:39 +01:00
  • d4256b1c8b Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view Tom Price 2015-05-25 22:34:40 +01:00
  • 60d418ef19 Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view Tom Price 2015-05-25 22:34:40 +01:00
  • 1f3bf96494 Add block tags to make it more semantic Tom Price 2015-05-25 22:31:36 +01:00
  • b7c1853bff Add block tags to make it more semantic Tom Price 2015-05-25 22:31:36 +01:00
  • fc6ce30ad0 Fixed fail (removed unnecessary css) David Taylor 2015-05-25 22:20:50 +01:00
  • a8ee56c4f5 Fixed fail (removed unnecessary css) David Taylor 2015-05-25 22:20:50 +01:00
  • 6ed2ceb04e Merge branch 'master' into revision-view Tom Price 2015-05-25 22:13:33 +01:00
  • d92462324b Merge branch 'master' into revision-view Tom Price 2015-05-25 22:13:33 +01:00
  • 90c92c255f Merged in timezone-fixes (pull request #40) Tom Price 2015-05-25 22:06:20 +01:00
  • aa648412a1 Merged in timezone-fixes (pull request #40) Tom Price 2015-05-25 22:06:20 +01:00
  • fb0fc3506b Fixed MIC photo logic David Taylor 2015-05-24 14:21:24 +01:00
  • c6037c44ce Fixed MIC photo logic David Taylor 2015-05-24 14:21:24 +01:00
  • 623e8017e7 More UI Improvements David Taylor 2015-05-24 12:54:29 +01:00
  • faedce316c More UI Improvements David Taylor 2015-05-24 12:54:29 +01:00
  • a66c7a79db Merge branch 'master' into revision-view David Taylor 2015-05-24 12:24:21 +01:00
  • 82041d413c Merge branch 'master' into revision-view David Taylor 2015-05-24 12:24:21 +01:00
  • 06f9bf6eec Uncommented captcha David Taylor 2015-05-24 12:14:43 +01:00
  • 641c065bd6 Uncommented captcha David Taylor 2015-05-24 12:14:43 +01:00
  • 1c95f7ef8b Fixed linebreaks in paperwork descriptions David Taylor 2015-05-24 12:09:20 +01:00
  • 76f72157f6 Fixed linebreaks in paperwork descriptions David Taylor 2015-05-24 12:09:20 +01:00
  • 7e582c5f60 README.md edited online with Bitbucket Nathan Penney 2015-05-24 10:15:18 +00:00
  • c895ba6df6 README.md edited online with Bitbucket Nathan Penney 2015-05-24 10:15:18 +00:00
  • 383760d9a2 Made index login_required David Taylor 2015-05-24 03:14:13 +01:00
  • bd3f959bf9 Made index login_required David Taylor 2015-05-24 03:14:13 +01:00
  • 52550dd86e Added icons to rigboard dropdown David Taylor 2015-05-24 03:13:57 +01:00
  • f20a80f588 Added icons to rigboard dropdown David Taylor 2015-05-24 03:13:57 +01:00
  • 96f5353c8e Fixed deleted event errors David Taylor 2015-05-24 03:01:01 +01:00
  • 8367bf169e Fixed deleted event errors David Taylor 2015-05-24 03:01:01 +01:00
  • ce6e044b8c Fixed icon typo David Taylor 2015-05-23 23:16:28 +01:00
  • bef497c08b Fixed icon typo David Taylor 2015-05-23 23:16:28 +01:00
  • 2bfa9321a3 Redesigned homepage David Taylor 2015-05-23 23:03:41 +01:00
  • cd97490e06 Redesigned homepage David Taylor 2015-05-23 23:03:41 +01:00
  • b3a3aef167 Merged in paperwork (pull request #41) Tom Price 2015-05-23 22:19:32 +01:00
  • 99c9f26aed Merged in paperwork (pull request #41) Tom Price 2015-05-23 22:19:32 +01:00
  • 333549fba0 Merge branch 'master' of bitbucket.org:nottinghamtec/pyrigs Tom Price 2015-05-23 22:12:48 +01:00
  • a75c83afd8 Merge branch 'master' of bitbucket.org:nottinghamtec/pyrigs Tom Price 2015-05-23 22:12:48 +01:00
  • 005bd90975 Merge registration into master, pull request #38. Tom Price 2015-05-23 22:12:17 +01:00
  • 021f440d43 Merge registration into master, pull request #38. Tom Price 2015-05-23 22:12:17 +01:00
  • 47e08eed4f Add links to detail pages David Taylor 2015-05-23 18:51:50 +01:00
  • d4b0187ecc Add links to detail pages David Taylor 2015-05-23 18:51:50 +01:00
  • 85a7a37280 Added urls for other models David Taylor 2015-05-23 18:34:35 +01:00
  • d0153f19c8 Added urls for other models David Taylor 2015-05-23 18:34:35 +01:00
  • 16cfc9c9ba Removed now un-necessary date format stuff (from revisions stuff) David Taylor 2015-05-23 17:03:58 +01:00
  • 7e8f8687d6 Removed now un-necessary date format stuff (from revisions stuff) David Taylor 2015-05-23 17:03:58 +01:00
  • 57771fd232 Set default date formats David Taylor 2015-05-23 16:57:45 +01:00
  • c5e1bc93cb Set default date formats David Taylor 2015-05-23 16:57:45 +01:00
  • 3c47b4a64b More work on other model support David Taylor 2015-05-23 16:49:54 +01:00
  • 3ed95d6687 More work on other model support David Taylor 2015-05-23 16:49:54 +01:00
  • 5f2fde3ecc Made it work for other models David Taylor 2015-05-23 14:57:29 +01:00
  • 6ab0715376 Made it work for other models David Taylor 2015-05-23 14:57:29 +01:00
  • e5a7da3d7d Fixed the error that made it not work at all David Taylor 2015-05-23 13:51:45 +01:00
  • 0ac49b5d04 Fixed the error that made it not work at all David Taylor 2015-05-23 13:51:45 +01:00
  • 0eb9317fc2 More UI stuff, and pagination on activity stream David Taylor 2015-05-23 04:53:17 +01:00
  • bf33607967 More UI stuff, and pagination on activity stream David Taylor 2015-05-23 04:53:17 +01:00
  • 7d0e89eb18 More UI improvements David Taylor 2015-05-23 03:20:27 +01:00
  • 77139a8821 More UI improvements David Taylor 2015-05-23 03:20:27 +01:00
  • c0dfbb760d Delete un-used file David Taylor 2015-05-23 02:27:31 +01:00
  • bb7c5aa43b Delete un-used file David Taylor 2015-05-23 02:27:31 +01:00
  • 4e5ddee31c More refactoring & improvements David Taylor 2015-05-23 02:23:31 +01:00
  • 2a93d48ca1 More refactoring & improvements David Taylor 2015-05-23 02:23:31 +01:00
  • 82c814cdd7 Added comments David Taylor 2015-05-23 00:08:47 +01:00
  • 7ad160c4cc Added comments David Taylor 2015-05-23 00:08:47 +01:00
  • 71fe91086f Removed unnecessary function David Taylor 2015-05-22 23:57:39 +01:00
  • b227dd066d Removed unnecessary function David Taylor 2015-05-22 23:57:39 +01:00
  • f7318a41b7 Restructured comparison logic so model references are used David Taylor 2015-05-22 23:53:47 +01:00
  • 8b8d52944b Restructured comparison logic so model references are used David Taylor 2015-05-22 23:53:47 +01:00