Commit graph

174 commits

Author SHA1 Message Date
Simon Brooke cf1eb70748 Merge remote-tracking branch 'origin/feature/28' into feature/28 2018-03-17 21:40:48 +00:00
Simon Brooke de4b76c5f1 Merge remote-tracking branch 'origin/feature/28' into feature/28 2018-03-17 18:43:03 +00:00
Simon Brooke f23e52a65b Squirrel-parse generated routes and queries are now working
Routes and queries auto-generated from migrations by [squirrel-parse](https://github.com/simon-brooke/squirrel-parse) are now actually working!
2018-03-17 18:41:52 +00:00
Simon Brooke 604e7f485d Squirrel-parse generated routes and queries are now working
Routes and queries auto-generated from migrations by [squirrel-parse]() are now actually working!
2018-03-17 18:40:31 +00:00
simon 9157871cc1 Added a note on locality indexing. 2017-07-24 19:46:52 +01:00
Simon Brooke 62ab37de47 Merge remote-tracking branch 'refs/remotes/origin/develop'
Conflicts:
	src/clj/youyesyet/routes/services.clj
2017-07-22 15:57:50 +01:00
simon e300d0c4c5 #28 Changed the way I'm doing REST, for simplicity 2017-07-22 11:04:59 +01:00
simon 89745e3a83 Minor UI fixes 2017-07-21 16:39:59 +01:00
simon 3a18cacf0f #43 Zoom and lat/long now captured in state. 2017-07-21 15:51:16 +01:00
simon 4dc7ad396a Merge branch 'feature/41' into develop 2017-07-21 14:18:37 +01:00
simon 2e81c7b664 #41 Updated client to cope with dwelling changs 2017-07-21 14:18:22 +01:00
simon 88c5c74c52 Merge branch 'feature/5' into feature/41 2017-07-21 12:40:57 +01:00
simon fc1b17b7a5 #41 Updated ERD; added and tested migrations. 2017-07-21 12:18:42 +01:00
simon c87efe9a66 Documentation changes associated with introdoction of codox 2017-07-21 08:46:50 +01:00
simon e77d5d0393 Documentation and disambiguation
Separate package name hierarchies for clj and cljs parts of the system, so that it's unambiguous what package (e.g. 'youyesyet.core' is.
2017-07-16 13:03:24 +01:00
simon 2ce44cc0b8 Progress... 2017-07-15 19:36:37 +01:00
simon 4213f6159c #28: only the very beginning of the beginning
Don't even know if this is worth doing - this specification language doesn't yet mean much to me.
2017-07-15 17:51:28 +01:00
simon be324e9d06 Beginnings of a working role-routing page
(also the first actual database reads)
2017-07-15 17:49:32 +01:00
simon d534302fd8 #5: Progress, but nothing working yet 2017-04-15 11:57:17 +01:00
simon 95507002c7 Very rough beginning of making the database stuff work. 2017-04-05 09:56:27 +01:00
simon 19e7b24933 Added lots of queries (not yet complete). 2017-04-04 09:33:24 +01:00
simon 3795f4e0fe #5: Sorting out merge horror 2017-04-01 15:24:30 +01:00
simon e425c56ec2 #5: Started work on roles switching 2017-04-01 15:11:50 +01:00
Simon Brooke 888205e069 Merge branch 'feature/36' into develop 2017-04-01 07:56:35 +01:00
Simon Brooke 32e9d9b9f5 #36: Fixed 2017-04-01 07:56:21 +01:00
Simon Brooke a8c0f48aa5 Stopping transient bower artefacts cluttering the repository 2017-04-01 07:17:54 +01:00
Simon Brooke 0ad6a3e81b Minor look-and-feel stuff. 2017-03-31 10:03:01 +01:00
Simon Brooke 0cb097a64d Merge branch 'feature/36' into develop 2017-03-31 07:31:15 +01:00
Simon Brooke 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
Simon Brooke c75bdb9e5e #36: Followup request doesn't actually send, everything else works 2017-03-30 22:15:03 +01:00
Simon Brooke 4be0b9ce08 Merge branch 'feature/13' into feature/36 2017-03-30 13:22:00 +01:00
Simon Brooke bc34ca16ff Merge branch 'develop' into feature/36 2017-03-30 07:03:24 +01:00
Simon Brooke 7d4bf2a2c2 Merge branch 'feature/33' into develop 2017-03-30 07:03:06 +01:00
Simon Brooke ca9807dc1c #33: Fix
Easy.
2017-03-30 07:02:52 +01:00
Simon Brooke 2863badef7 Updated README. 2017-03-29 11:29:13 +01:00
Simon Brooke ba27df1750 Don't know what happened there!
Moving favicon.ico back into place.
2017-03-29 10:23:02 +01:00
Simon Brooke 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
Simon Brooke 63a0ac0aca Fixed image path for issues.png which was absolute not relative. 2017-03-29 07:20:37 +01:00
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