Commit graph

95 commits

Author SHA1 Message Date
6247fa9ddf Merge branch 'release/1.0.0rc1' into develop 2017-08-08 23:54:55 +01:00
5634ec3e0f Upversioned; Embarrassing last minute regression 2017-08-08 23:52:08 +01:00
bf94fa8d7e Genuinely pluggable/configurable formatter extensions! 2017-08-08 23:27:35 +01:00
08c560fe23 Internationalisation has now been moved into its own library. 2017-08-08 15:56:39 +01:00
8699b7cff4 Internationalisation support
... but no actual translation files yet.
2017-08-08 15:50:33 +01:00
a2b6d6f72b Initial work on i18n 2017-08-08 09:01:35 +01:00
19a715c4fb A very long way towards extensible formatters 2017-08-07 23:21:45 +01:00
91367e40aa More orthogonal inclusion processing 2017-08-02 07:36:37 +01:00
9630e16d94 Mermaid now working
Still needs refactoring to generalise the extension architecture.
2017-07-30 23:25:24 +01:00
fd5cd11024 Experimental tidying up after vega introduction
None of this is very significant, but it is small improvements.
2017-07-30 14:40:56 +01:00
c289f10524 Updated introduction and README to say you can now upload files. 2017-07-26 17:07:40 +01:00
19e5920c9d Merge branch 'feature/17' into develop 2017-07-26 17:02:47 +01:00
c2e771561d #17: Fix. 2017-07-26 16:51:31 +01:00
5d10ae2e54 Merge remote-tracking branch 'origin/develop' into develop 2017-07-26 14:55:26 +01:00
6b6c7fb014 Merge branch 'feature/13' into develop 2017-07-26 14:54:49 +01:00
3faf96a470 Merge branch 'feature/13' into develop 2017-07-26 14:50:25 +01:00
fa944f1780 #13 WOW! It works! And it's beautiful! 2017-07-26 14:50:17 +01:00
a1fa392699 Merge branch 'master' into develop 2017-07-24 07:00:09 +01:00
7fb6bb19ba Ignore all Bower and Vendor files 2017-07-24 06:40:31 +01:00
bd0e0a802a WIP on Illuminator: minor look and feel tweeks 2017-07-24 00:31:11 +01:00
Simon Brooke
ee3ec5c2ad Merge pull request #19 from jaromil/update
updated to dependencies and improved logging setup
2017-07-23 20:17:18 +01:00
Jaromil
11ed76213f updated to dependencies and improved logging setup 2017-07-22 18:32:22 +02:00
1575fc4368 Merge branch 'feature/18' into develop 2017-03-13 20:35:51 +00:00
77a18e20a5 #18: Very satisfactory!
Looking good at all scales, and in the end I didn't use bootstrap (although it would still be a good thing to learn it).
2017-03-13 20:35:13 +00:00
a6f748b49f That's bootstrap integrated,
Although I'm not actually using it yet. But one thing is clear: what
actually made the difference was setting the initial-scale on the
viewport. So I may not need bootstrap (although it would still be good
to learn it)
2017-03-13 11:29:44 +00:00
506898e761 #18: Experimentally added Bootstrap
It's what all the cool kids are using.
2017-03-13 10:46:27 +00:00
136057a09e #18: A lot better, but not there yet
Looks fine on desktops. On phones the wiki page looks reasonable, but for some reason I can't yet fathom has a huge right margin; tablets I haven't tackled yet.
2017-03-12 19:26:26 +00:00
6873b11fbd Merge branch 'feature/15' into develop 2017-03-12 17:20:03 +00:00
474dd7a397 Bother
Passwd.html should have been in the last fix, and the passwd file itself should emphatically not!
2017-03-12 17:16:30 +00:00
2f897089fe #15: Fix
Rather nice and satisfactory. Slightly conflates the issue of configuration and internationalisation at present, but I think internationalisation is a target to hit as a separate job.
2017-03-12 17:14:43 +00:00
5d9462b7c3 Added resources/public/vendor to .gitignore
Since (I think) that's where bower installs stuff.
2017-03-12 13:44:22 +00:00
4a7781ef05 Added information about Docker image to README and Introduction. 2016-12-27 13:15:53 +00:00
05db88dd97 Now with added Docker goodness! 2016-12-27 13:12:56 +00:00
7e13e25d14 Added a bit on how to troubleshoot the bug I've been dealing with today. 2016-12-20 14:36:22 +00:00
fb18ebef51 Reformatting of history page to make it a bit clearer how it works. 2016-12-20 13:48:15 +00:00
a8929894d4 Fixed a nasty breaking bug when the side bar file wasn't named as expected! 2016-12-20 12:13:04 +00:00
2fd03caade Very small change, fixes #9, no apparent downside. 2016-09-18 17:36:14 +01:00
05db4e6977 Reversioned to 0.5.1-SNAPSHOT (not issuing a new develop version, because
fix was so minor).
2016-09-16 13:46:17 +01:00
832d72e009 Merge branch 'release/0.5.0-rc3' 2016-09-16 13:44:18 +01:00
e0dcaebd87 Bumped version number to 0.5.0-rc3 2016-09-16 13:41:56 +01:00
dba58e4eca Fix for issue #8. 2016-09-16 13:07:16 +01:00
547874791a Even more trivial documentation change... 2016-09-11 20:09:31 +01:00
1ea0e869d9 Trivial changes to documentation. 2016-09-11 20:03:15 +01:00
d59b26c918 OK, I don't know what lein release does, but it doesn't do what I thought
it did. Merged 'develop' into 'master' manually.
2016-09-11 18:44:27 +01:00
ad152b336a Merge branch 'feature/4' into develop 2016-09-11 17:40:04 +01:00
44263c3fa0 Reorganised routes so that routes/wiki.clj is less overcrowded and messy. 2016-09-11 17:38:46 +01:00
09fe67a26e Seems all to be working now. You can't actually delete users through the user
interface, but you can add and edit them.
2016-09-11 16:01:51 +01:00
de7a553a86 Done, working. 2016-09-02 16:51:53 +01:00
ee5630ecb2 Much restyling to add WEFT branding and a wee advertisement.
Also in the process updated dependencies.
2016-09-02 16:27:59 +01:00
0613577825 Fixed a typo in Introduction.md; brought README.md back into line with
Introduction.md
2016-08-21 12:38:43 +01:00