Commit graph

166 commits

Author SHA1 Message Date
ee0453e395 Allow configuration to be overridden by environment variables
This is (I think) the final piece in enabling Smeagol to be run neatly from Docker and, indeed, from a pre-packaged jar file.
2017-09-12 11:29:42 +01:00
9152d1fe6d Version 0.99.11-SNAPSHOT 2017-09-12 01:14:45 +01:00
3a4d177923 Version 0.99.10 2017-09-12 01:03:18 +01:00
38bea793c5 Merge branch 'feature/33' into develop 2017-09-12 00:57:32 +01:00
2f4f7aa1c5 #33: Fix 2017-09-12 00:49:16 +01:00
f3883c6b07 Experimental changes to Dockerfile 2017-09-11 13:25:10 +01:00
2f6f9286a3 Tidy-up and robustness; no major functional change. 2017-09-11 13:04:51 +01:00
9f3c16a348 Set version to 0.99.10-SNAPSHOT 2017-09-11 08:05:20 +01:00
ccb62b9d6f Merge branch 'release/1.0.0-rc3' into develop 2017-09-11 07:59:21 +01:00
f92a681834 Upversion to 1.0.0rc3 2017-09-11 07:58:48 +01:00
75c5618239 Fixed bug where password could be blanked if a user was edited and no new password set 2017-09-11 07:53:36 +01:00
656d503128 Merge branch 'feature/31' into develop 2017-09-10 22:56:58 +01:00
843a1d084b #31: Fix 2017-09-10 22:55:48 +01:00
1353e27f92 Merge branch 'feature/32' into develop 2017-09-10 20:03:08 +01:00
420dcb8016 #32: Fix, and it's rather wonderful. 2017-09-10 20:02:58 +01:00
b6a2bdd4bc Merge branch 'feature/30' into develop 2017-09-09 23:38:29 +01:00
d27891a152 #30: Fix. 2017-09-09 23:38:18 +01:00
88d26e6d45 #30: Progress; not yet satisfied. 2017-09-09 23:19:45 +01:00
85097f942a Kibitzed 2017-09-09 22:18:22 +01:00
6f22517f0c Sanity testing on startup. 2017-09-09 22:01:07 +01:00
c76c821770 Version 0.99.9-SNAPSHOT 2017-09-09 21:50:54 +01:00
d4ac9b3586 Version 0.99.8 2017-09-09 15:42:38 +01:00
8eca444d0b Many changes, mainly to content, in preparation for version 1.0.0 2017-09-09 15:42:04 +01:00
85467c19ce #23, #29: Fix. Removed sensitive information from log file. 2017-09-09 13:54:08 +01:00
44703d5889 Optional environment variable for passwd file. 2017-09-09 11:42:09 +01:00
3ed44ec3fc #25: Fix.
Upgraded to i18n 1.0.3
2017-09-09 11:23:20 +01:00
fab37d5683 #25: Fix (awaiting tidy up)
This is a fix, but it's a fix against the `develop` branch of [internationalisation](https://github.com/simon-brooke/internationalisation), so I need to do a new release of internationalisation before I call this a full fix.
2017-09-08 16:04:08 +01:00
335c2f2329 Still working on the problem of reading resources frm JAR
This isn't a fix, it's a step on the way to a fix.
2017-09-07 14:58:01 +01:00
d4ed336827 Mainly internationalisation improvements - not finished yet. 2017-09-07 14:44:13 +01:00
Simon Brooke
a7409c25be Merge pull request #27 from desolate-planet/develop
fixed I18n resource file lookup
2017-09-02 09:10:41 +01:00
stephen munro
b6454a81df fixed I18n resource file lookup 2017-09-01 22:37:32 +01:00
a0a56bd61b Merge branch 'feature/21' into develop 2017-09-01 22:20:02 +01:00
3e686e9c5b #21: Fix 2017-09-01 22:19:49 +01:00
4d205a4042 Version 0.99.8-SNAPSHOT 2017-08-18 15:43:57 +01:00
407547addf Version 0.99.7 2017-08-18 14:33:41 +01:00
5fdb3ffa1f Kitten on keyboard error. Again. 2017-08-18 14:33:30 +01:00
c5a9cf7b2e Version 0.99.7 2017-08-18 14:09:14 +01:00
239d6372e1 Still trying to get lein release to run cleanly. 2017-08-18 14:08:34 +01:00
e596b97308 Version 0.99.7 2017-08-18 14:06:08 +01:00
df05504406 Added documentation of the configuration file. 2017-08-18 14:05:24 +01:00
c1c42ff830 Version 0.99.7-SNAPSHOT 2017-08-18 13:44:33 +01:00
d40ab822bf Version 0.99.6 2017-08-18 13:28:42 +01:00
e20b1127ab Version 0.99.6-SNAPSHOT 2017-08-18 13:28:24 +01:00
eafc4e9eb0 Note that jar files still don't work. 2017-08-18 13:20:44 +01:00
f83b0cdb75 Working towards serving content from outside the jar 2017-08-18 13:08:23 +01:00
54dcdd5b4c Mostly added documentation, but some minor changes. 2017-08-09 18:06:20 +01:00
f54a2d46f3 Version 0.99.6 2017-08-09 09:41:55 +01:00
0bc2b22678 Still trying to get automated release working. 2017-08-09 09:41:29 +01:00
7b41c93814 Still experimenting with automated release 2017-08-09 09:01:49 +01:00
4d618569ad Version 0.99.6 2017-08-09 09:00:58 +01:00