 Simon Brooke
|
14ec599fd2
|
Merge branch 'develop' into feature/36
|
2017-03-29 06:40:49 +01:00 |
|
|
Simon Brooke
|
c1b9e97849
|
Merge branch 'feature/37' into develop
|
2017-03-29 06:40:19 +01:00 |
|
|
Simon Brooke
|
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 |
|
|
Simon Brooke
|
b1956def91
|
#37: never set :page to nil
|
2017-03-29 06:14:15 +01:00 |
|
|
Simon Brooke
|
36d8fa1273
|
#13: Beginning work on outbound queue
|
2017-03-29 06:10:07 +01:00 |
|
|
Simon Brooke
|
00c7cb9b84
|
#37: Preliminary work
|
2017-03-29 06:05:20 +01:00 |
|
|
Simon Brooke
|
92ad75da92
|
Merge branch 'master' into develop
|
2017-03-26 20:43:13 +01:00 |
|
|
Simon Brooke
|
ff92725cf6
|
Merge develop into master
|
2017-03-26 18:54:13 +01:00 |
|
|
Simon Brooke
|
e5299bd2cf
|
Quick fix on select menus
|
2017-03-26 18:47:45 +01:00 |
|
|
Simon Brooke
|
a589afb6ab
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-03-26 18:42:15 +01:00 |
|
|
Simon Brooke
|
86285e01b9
|
Merge branch 'feature/30' into develop
|
2017-03-26 18:40:11 +01:00 |
|
|
Simon Brooke
|
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 |
|
|
simon
|
560938e6ae
|
#30: Still not quite complete
|
2017-03-26 15:58:43 +01:00 |
|
|
Simon Brooke
|
7621040c8f
|
Now with the right pin image; pin click still not working.
|
2017-03-26 12:03:25 +01:00 |
|
|
Simon Brooke
|
6c50592543
|
Map pins on map working!
|
2017-03-26 11:30:41 +01:00 |
|
|
Simon Brooke
|
b95fa9919e
|
Woohoo! Not broken, looking good
|
2017-03-26 10:17:41 +01:00 |
|
|
Simon Brooke
|
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 |
|
|
simon
|
013ebea4db
|
#30: Very close to good on client look and feell
|
2017-03-25 14:43:47 +00:00 |
|
|
simon
|
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 |
|
|
Simon Brooke
|
9392091428
|
Simplified geographic sharding
|
2017-03-23 10:02:20 +00:00 |
|
|
simon
|
9d83c585dd
|
#30: Another removed panel.
|
2017-03-22 21:01:26 +00:00 |
|
|
simon
|
e782560d40
|
#30: More progress, not finished.
|
2017-03-22 20:58:50 +00:00 |
|
|
simon
|
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 |
|
|
Simon Brooke
|
d31ed67b98
|
Competitor analysis, more on scaling, a dummy login page
|
2017-03-22 18:56:56 +00:00 |
|
|
Simon Brooke
|
0a01978036
|
#30: Extremely small fix to last night's commit
|
2017-03-20 08:19:38 +00:00 |
|
|
Simon Brooke
|
e5d399b86d
|
Significant progress, but a long way from finished.
|
2017-03-19 23:28:27 +00:00 |
|
|
Simon Brooke
|
7439e5ae15
|
#30: Starting to work.
We can serve both conventional pages, and the app.
|
2017-03-19 17:54:37 +00:00 |
|
|
simon
|
68bb22bd31
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-03-19 16:59:40 +00:00 |
|
|
Simon Brooke
|
db8c3ed22c
|
Merge branch 'feature/9' into develop
|
2017-03-19 16:34:19 +00:00 |
|
|
Simon Brooke
|
ce9520fc2c
|
Added luminus logo to credits
|
2017-03-19 16:32:14 +00:00 |
|
|
simon
|
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 |
|
|
Simon Brooke
|
89beabfc87
|
Merge branch 'develop' into feature/9
|
2017-03-18 09:09:07 +00:00 |
|
|
Simon Brooke
|
a3fe0db2d1
|
Ooops! Home was broken in last commit
|
2017-03-18 09:02:29 +00:00 |
|
|
Simon Brooke
|
dd85254607
|
Merge branch 'feature/clientframework' into develop
|
2017-03-18 08:56:28 +00:00 |
|
|
Simon Brooke
|
9ff8235d3e
|
/clientframework: Restructured a bit
|
2017-03-18 08:56:15 +00:00 |
|
|
Simon Brooke
|
94465273a0
|
Sorted a bit of merge mess.
|
2017-03-18 07:37:05 +00:00 |
|
|
Simon Brooke
|
250e0e6887
|
Merge branch 'feature/9' into feature/clientframework
|
2017-03-18 07:29:46 +00:00 |
|
|
Simon Brooke
|
95436e955b
|
Fixes to get the whole lot to build as a war
|
2017-03-17 23:04:47 +00:00 |
|
|
Simon Brooke
|
933e5ac2a4
|
#9: Woot woot woot!
Map now working with OSM tiles
|
2017-03-17 21:45:11 +00:00 |
|
|
Simon Brooke
|
ee9654aa02
|
Merge branch 'feature/22' into develop
|
2017-03-16 21:19:14 +00:00 |
|
|
Simon Brooke
|
84c2bb19c4
|
Added credits to the spinner CSS
|
2017-03-16 21:16:41 +00:00 |
|
|
Simon Brooke
|
59378b5a5f
|
Very pleased with this
All the basic bits work; startup spinner is very neat.
|
2017-03-16 21:16:07 +00:00 |
|
|
Simon Brooke
|
b4618a4311
|
Look-and-feel of dynamic pages now very good
|
2017-03-16 19:39:27 +00:00 |
|
|
Simon Brooke
|
6b9e315b2f
|
Dynamic site now looks very like the dummy...
But the phone menu isn't working nicely yet.
|
2017-03-16 19:27:08 +00:00 |
|
|
Simon Brooke
|
9540ae0575
|
Added collaboration stuff to README
|
2017-03-16 09:00:39 +00:00 |
|
|
Simon Brooke
|
a46f55e50e
|
#22: This isn't even nearly working...
But it's starting to work!
|
2017-03-16 08:22:07 +00:00 |
|
|
Simon Brooke
|
036c84972a
|
Merge branch 'feature/21' into develop
|
2017-03-16 06:02:39 +00:00 |
|
|
Simon Brooke
|
1f18be5771
|
Added 'profiles.clj' to gitignore
|
2017-03-16 06:02:11 +00:00 |
|
|
Simon Brooke
|
ff4565a30d
|
Added an 'about' file to the dummy
|
2017-03-15 21:27:36 +00:00 |
|