Commit graph

96 commits

Author SHA1 Message Date
c1a120daf2 #36 App user interface now fully working for pre-alpha release
... but app.js is still not being deployed.
2017-03-31 07:30:55 +01:00
c75bdb9e5e #36: Followup request doesn't actually send, everything else works 2017-03-30 22:15:03 +01:00
4be0b9ce08 Merge branch 'feature/13' into feature/36 2017-03-30 13:22:00 +01:00
bc34ca16ff Merge branch 'develop' into feature/36 2017-03-30 07:03:24 +01:00
7d4bf2a2c2 Merge branch 'feature/33' into develop 2017-03-30 07:03:06 +01:00
ca9807dc1c #33: Fix
Easy.
2017-03-30 07:02:52 +01:00
2863badef7 Updated README. 2017-03-29 11:29:13 +01:00
ba27df1750 Don't know what happened there!
Moving favicon.ico back into place.
2017-03-29 10:23:02 +01:00
6483b5ae9d #36: Still not working, but good enough for now
The compiled clojurescript is still not correctly deployed in the war; however, it is now compiled correctly and does work, and can be moved into place manually after deployment.
2017-03-29 10:22:13 +01:00
63a0ac0aca Fixed image path for issues.png which was absolute not relative. 2017-03-29 07:20:37 +01:00
14ec599fd2 Merge branch 'develop' into feature/36 2017-03-29 06:40:49 +01:00
c1b9e97849 Merge branch 'feature/37' into develop 2017-03-29 06:40:19 +01:00
72b4f058ed #37: Well, THAT was easy!
Protective wrapper around :page rendering so that the initial, transient null value doesn't get rendered!
2017-03-29 06:40:04 +01:00
b1956def91 #37: never set :page to nil 2017-03-29 06:14:15 +01:00
36d8fa1273 #13: Beginning work on outbound queue 2017-03-29 06:10:07 +01:00
00c7cb9b84 #37: Preliminary work 2017-03-29 06:05:20 +01:00
92ad75da92 Merge branch 'master' into develop 2017-03-26 20:43:13 +01:00
ff92725cf6 Merge develop into master 2017-03-26 18:54:13 +01:00
e5299bd2cf Quick fix on select menus 2017-03-26 18:47:45 +01:00
a589afb6ab Merge remote-tracking branch 'origin/develop' into develop 2017-03-26 18:42:15 +01:00
86285e01b9 Merge branch 'feature/30' into develop 2017-03-26 18:40:11 +01:00
28f5a3f10c #30: Done
The concerns of the server and client side are now separated; there's plenty of work still to be done on both but it's clear what belongs where.
2017-03-26 18:40:01 +01:00
560938e6ae #30: Still not quite complete 2017-03-26 15:58:43 +01:00
7621040c8f Now with the right pin image; pin click still not working. 2017-03-26 12:03:25 +01:00
6c50592543 Map pins on map working! 2017-03-26 11:30:41 +01:00
b95fa9919e Woohoo! Not broken, looking good 2017-03-26 10:17:41 +01:00
65b69939b3 UI mostly working
There's no target yet for the followup form, but it otherwise good.
2017-03-26 09:12:15 +01:00
013ebea4db #30: Very close to good on client look and feell 2017-03-25 14:43:47 +00:00
d36c58b44c #30: Tremendous progress, now understand reg-sub model
Although there's no actual collection of data from the back end, the user interface is now mostly working. And, I flatter myself, looking good.
2017-03-24 10:32:31 +00:00
9392091428 Simplified geographic sharding 2017-03-23 10:02:20 +00:00
9d83c585dd #30: Another removed panel. 2017-03-22 21:01:26 +00:00
e782560d40 #30: More progress, not finished. 2017-03-22 20:58:50 +00:00
5b35b5bc18 #30: Roughly working on Tomcat.
Not perfect yet by a long way but good enough for alpha.
2017-03-22 18:58:14 +00:00
d31ed67b98 Competitor analysis, more on scaling, a dummy login page 2017-03-22 18:56:56 +00:00
0a01978036 #30: Extremely small fix to last night's commit 2017-03-20 08:19:38 +00:00
e5d399b86d Significant progress, but a long way from finished. 2017-03-19 23:28:27 +00:00
7439e5ae15 #30: Starting to work.
We can serve both conventional pages, and the app.
2017-03-19 17:54:37 +00:00
68bb22bd31 Merge remote-tracking branch 'origin/develop' into develop 2017-03-19 16:59:40 +00:00
db8c3ed22c Merge branch 'feature/9' into develop 2017-03-19 16:34:19 +00:00
ce9520fc2c Added luminus logo to credits 2017-03-19 16:32:14 +00:00
d2d98b13b9 Merge branch 'feature/21' into develop 2017-03-19 16:01:46 +00:00
Simon Brooke
b581f8c06e Minor edits 2017-03-19 15:14:54 +00:00
89beabfc87 Merge branch 'develop' into feature/9 2017-03-18 09:09:07 +00:00
a3fe0db2d1 Ooops! Home was broken in last commit 2017-03-18 09:02:29 +00:00
dd85254607 Merge branch 'feature/clientframework' into develop 2017-03-18 08:56:28 +00:00
9ff8235d3e /clientframework: Restructured a bit 2017-03-18 08:56:15 +00:00
94465273a0 Sorted a bit of merge mess. 2017-03-18 07:37:05 +00:00
250e0e6887 Merge branch 'feature/9' into feature/clientframework 2017-03-18 07:29:46 +00:00
95436e955b Fixes to get the whole lot to build as a war 2017-03-17 23:04:47 +00:00
933e5ac2a4 #9: Woot woot woot!
Map now working with OSM tiles
2017-03-17 21:45:11 +00:00