Commit graph

Select branches

Hide pull requests

develop

feature/2

feature/21

feature/22

feature/36

feature/9

feature/reflow-app

master

salvage

Mono Color

• 4be0b9ce08 Merge branch 'feature/13' into feature/36 Simon Brooke 2017-03-30 13:22:00 +0100
• bc34ca16ff Merge branch 'develop' into feature/36 Simon Brooke 2017-03-30 07:03:24 +0100
• 7d4bf2a2c2 Merge branch 'feature/33' into develop Simon Brooke 2017-03-30 07:03:06 +0100
• ca9807dc1c #33: Fix Simon Brooke 2017-03-30 07:02:52 +0100
• 2863badef7 Updated README. Simon Brooke 2017-03-29 11:29:13 +0100
• ba27df1750 Don't know what happened there! Simon Brooke 2017-03-29 10:23:02 +0100
• 6483b5ae9d #36: Still not working, but good enough for now Simon Brooke 2017-03-29 10:22:13 +0100
• 63a0ac0aca Fixed image path for issues.png which was absolute not relative. Simon Brooke 2017-03-29 07:20:37 +0100
• 14ec599fd2 Merge branch 'develop' into feature/36 Simon Brooke 2017-03-29 06:40:49 +0100
• c1b9e97849 Merge branch 'feature/37' into develop Simon Brooke 2017-03-29 06:40:19 +0100
• 72b4f058ed #37: Well, THAT was easy! Simon Brooke 2017-03-29 06:40:04 +0100
• b1956def91 #37: never set :page to nil Simon Brooke 2017-03-29 06:14:15 +0100
• 36d8fa1273 #13: Beginning work on outbound queue Simon Brooke 2017-03-29 06:10:07 +0100
• 00c7cb9b84 #37: Preliminary work Simon Brooke 2017-03-29 06:05:20 +0100
• 92ad75da92 Merge branch 'master' into develop Simon Brooke 2017-03-26 20:43:13 +0100
• ff92725cf6 Merge develop into master Simon Brooke 2017-03-26 18:53:14 +0100
• e5299bd2cf Quick fix on select menus Simon Brooke 2017-03-26 18:47:45 +0100
• a589afb6ab Merge remote-tracking branch 'origin/develop' into develop Simon Brooke 2017-03-26 18:42:15 +0100
• 86285e01b9 Merge branch 'feature/30' into develop Simon Brooke 2017-03-26 18:40:11 +0100
• 28f5a3f10c #30: Done Simon Brooke 2017-03-26 18:40:01 +0100
• 560938e6ae #30: Still not quite complete simon 2017-03-26 15:58:43 +0100
• 7621040c8f Now with the right pin image; pin click still not working. Simon Brooke 2017-03-26 12:03:25 +0100
• 6c50592543 Map pins on map working! Simon Brooke 2017-03-26 11:30:41 +0100
• b95fa9919e Woohoo! Not broken, looking good Simon Brooke 2017-03-26 10:17:41 +0100
• 65b69939b3 UI mostly working Simon Brooke 2017-03-26 09:12:15 +0100
• 013ebea4db #30: Very close to good on client look and feell simon 2017-03-25 14:43:47 +0000
• d36c58b44c #30: Tremendous progress, now understand reg-sub model simon 2017-03-24 10:32:31 +0000
• 9392091428 Simplified geographic sharding Simon Brooke 2017-03-23 10:02:20 +0000
• 9d83c585dd #30: Another removed panel. simon 2017-03-22 21:01:26 +0000
• e782560d40 #30: More progress, not finished. simon 2017-03-22 20:58:50 +0000
• 5b35b5bc18 #30: Roughly working on Tomcat. simon 2017-03-22 18:58:14 +0000
• d31ed67b98 Competitor analysis, more on scaling, a dummy login page Simon Brooke 2017-03-22 18:56:56 +0000
• 0a01978036 #30: Extremely small fix to last night's commit Simon Brooke 2017-03-20 08:19:38 +0000
• e5d399b86d Significant progress, but a long way from finished. Simon Brooke 2017-03-19 23:28:27 +0000
• 7439e5ae15 #30: Starting to work. Simon Brooke 2017-03-19 17:54:37 +0000
• 68bb22bd31 Merge remote-tracking branch 'origin/develop' into develop simon 2017-03-19 16:59:40 +0000
• db8c3ed22c Merge branch 'feature/9' into develop Simon Brooke 2017-03-19 16:34:19 +0000
• ce9520fc2c Added luminus logo to credits Simon Brooke 2017-03-19 16:32:14 +0000
• d2d98b13b9 Merge branch 'feature/21' into develop simon 2017-03-19 16:01:46 +0000
• b581f8c06e Minor edits Simon Brooke 2017-03-19 15:14:54 +0000
• 89beabfc87 Merge branch 'develop' into feature/9 Simon Brooke 2017-03-18 09:09:07 +0000
• a3fe0db2d1 Ooops! Home was broken in last commit Simon Brooke 2017-03-18 09:02:29 +0000
• dd85254607 Merge branch 'feature/clientframework' into develop Simon Brooke 2017-03-18 08:56:28 +0000
• 9ff8235d3e /clientframework: Restructured a bit Simon Brooke 2017-03-18 08:56:15 +0000
• 94465273a0 Sorted a bit of merge mess. Simon Brooke 2017-03-18 07:37:05 +0000
• 250e0e6887 Merge branch 'feature/9' into feature/clientframework Simon Brooke 2017-03-18 07:29:46 +0000
• 95436e955b Fixes to get the whole lot to build as a war feature/9 Simon Brooke 2017-03-17 23:04:47 +0000
• 933e5ac2a4 #9: Woot woot woot! Simon Brooke 2017-03-17 21:45:11 +0000
• ee9654aa02 Merge branch 'feature/22' into develop Simon Brooke 2017-03-16 21:19:14 +0000
• 84c2bb19c4 Added credits to the spinner CSS feature/22 Simon Brooke 2017-03-16 21:16:41 +0000
• 59378b5a5f Very pleased with this Simon Brooke 2017-03-16 21:16:07 +0000
• b4618a4311 Look-and-feel of dynamic pages now very good Simon Brooke 2017-03-16 19:39:27 +0000
• 6b9e315b2f Dynamic site now looks very like the dummy... Simon Brooke 2017-03-16 19:27:08 +0000
• 9540ae0575 Added collaboration stuff to README Simon Brooke 2017-03-16 09:00:39 +0000
• a46f55e50e #22: This isn't even nearly working... Simon Brooke 2017-03-16 08:22:07 +0000
• 036c84972a Merge branch 'feature/21' into develop Simon Brooke 2017-03-16 06:02:39 +0000
• 1f18be5771 Added 'profiles.clj' to gitignore Simon Brooke 2017-03-16 06:02:11 +0000
• ff4565a30d Added an 'about' file to the dummy Simon Brooke 2017-03-15 21:27:36 +0000
• 0db6a2b918 #21: Oops! Forgot the organisers feature/21 simon 2017-03-15 20:15:49 +0000
• d83a7924e2 #21: Tables created simon 2017-03-15 20:13:22 +0000
• 3850753743 Minor fix to .gitignore simon 2017-03-15 17:27:03 +0000
• a9034dd367 Ooops! Made the links in the dummy actually work. Simon Brooke 2017-03-15 08:30:22 +0000
• fb9c80c68d Added a note about the dummy to README Simon Brooke 2017-03-14 20:55:05 +0000
• bd0c77f953 Just making all the links work Simon Brooke 2017-03-14 20:24:57 +0000
• cc6b7e65a5 This effectively makes a reasonably full dummy Simon Brooke 2017-03-14 20:10:23 +0000
• 16b45a1b6e Added a lot of a dummy website, to guide actual building of the app. simon 2016-12-28 21:28:09 +0000
• fe7028de8e Basically just updated libraries. Simon Brooke 2016-12-27 22:04:11 +0000
• 4a60c22731 Still nothing working yet. simon 2016-10-19 13:26:55 +0100
• 58db251505 Merge branch 'master' of github.com:simon-brooke/youyesyet simon 2016-10-19 12:02:04 +0100
• 709b8a6e87 Further work on maps - not fully working yet. simon 2016-10-19 12:00:06 +0100
• c4a337da46 Added externs Simon Brooke 2016-10-19 11:59:08 +0100
• 5676ba2612 Beginning work on getting a map working. Simon Brooke 2016-10-19 11:09:22 +0100
• 682f952b66 Merge branch 'master' of github.com:simon-brooke/youyesyet Simon Brooke 2016-10-16 10:18:26 +0100
• a6e9e58f6e Added lein-bower in an attempt to bring javascript resources into auto-build control. Simon Brooke 2016-10-16 10:16:41 +0100
• 46213f3986 Small additions to the scaling document. Simon Brooke 2016-10-15 09:49:25 +0100
• 1c35516c5f Added a not on scaling. Simon Brooke 2016-10-15 09:38:31 +0100
• d1669da8ea Added skeletons for all the views specified in the specification. These are skeletons only at this stage; they don't actually do anything yet. simon 2016-10-14 18:15:04 +0100
• d9a90bc1cb Merge branch 'master' of github.com:simon-brooke/youyesyet simon 2016-10-14 17:44:04 +0100
• 42635878ee Fixed the 'down' migration script to actually drop the right stuff. simon 2016-10-14 17:42:58 +0100
• c5900149af Added basic setup migration. simon 2016-10-14 17:37:29 +0100
• 1b5c36a2b0 Merge branch 'master' of github.com:simon-brooke/youyesyet Simon Brooke 2016-10-14 13:52:06 +0100
• 9b36708c4b Something nasty got scrambled in the editor. Think it's fixed now. Simon Brooke 2016-10-14 13:50:56 +0100
• bd9c6eccb5 Merge branch 'master' of github.com:simon-brooke/youyesyet simon 2016-10-14 13:46:14 +0100
• 5a298b721b Added an 'is_admin' flag to the canvassers table. Simon Brooke 2016-10-14 13:45:11 +0100
• b93076c02f Altered the schema to give canvassers a formal primary key, since we cannot use the username as primary key because it won't exist for users who have not yet completed the introduction process. Simon Brooke 2016-10-14 13:42:00 +0100
• 63b4835852 Added entity-relationship diagram. simon 2016-10-14 13:19:01 +0100
• a8392292f9 Linking in the user-oriented specification simon 2016-10-14 12:10:08 +0100
• d89983626d Added some specification documentation. simon 2016-10-14 12:06:34 +0100
• 3864a3851f The init-db! function in schema now creates the database correctly. simon 2016-10-13 16:23:12 +0100
• 70aaf92002 Schema more or less complete - at least for first pass - but not yet tested. simon 2016-10-13 15:27:05 +0100
• 38f71f608c Yet more updates to README. simon 2016-10-13 14:42:48 +0100
• 87b7fefd65 More changes to README. simon 2016-10-13 14:38:48 +0100
• 5e2e80c316 Updated the README simon 2016-10-13 14:34:05 +0100
• b6a24bc1ce Starting to get the project set up. Nothing is even nearly complete yet. simon 2016-10-13 14:25:54 +0100