Commit graph

242 commits

Author SHA1 Message Date
915b5b2a6b Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 19:15:19 +00:00
7ddff8434a Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 19:14:42 +00:00
24888d27fc Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 19:01:47 +00:00
da3bde16d0 Added 'list uploaded files' page, only accessible if logged in. 2020-02-07 19:01:30 +00:00
84360110fc Fixes to two minor bugs
* Wrong URL printed in upload page;
* 'New file Foo' instead of 'New file Edit Foo' as default git commit message for a new file.
2020-02-07 14:20:32 +00:00
dad380e0d9
Attempting to understand why the configuration doesn't load. 2020-02-06 15:23:59 +00:00
324f26dbf7 Merge remote-tracking branch 'origin/develop' into develop 2020-02-05 23:49:09 +00:00
a6fb758314 Separate menu icon onto its own line, relativise the URL 2020-02-05 23:49:02 +00:00
Simon Brooke
2496ea8f4d
Merge pull request #41 from DomainDrivenArchitecture/make_include_more_fault_tolerant
make include error handling more user friendly
2020-02-05 23:47:45 +00:00
d6d0a5fc40 Another bit of #44, which got missed somehow. 2020-02-05 23:15:48 +00:00
b2003480fd
Merge remote-tracking branch 'origin/develop' into develop 2020-02-05 22:32:43 +00:00
3f667afb35 #44: fixed 2020-02-05 18:21:02 +00:00
ab2ec82f5e Merge branch 'develop' into origin/develop 2020-02-05 17:47:05 +00:00
38e4207d4a Minor change to log message 2020-02-05 17:45:31 +00:00
1105eacb05
lein-release plugin: bumped version from 1.0.3 to 1.0.4-SNAPSHOT for next development cycle 2020-02-05 10:47:22 +00:00
a821f8d988
lein-release plugin: preparing 1.0.3 release 2020-02-05 10:47:13 +00:00
5b01945c58
Trying to sort out the release process, which is not working 2020-02-05 10:38:12 +00:00
6e907cc85d Upversioned to '1.0.3-SNAPSHOT'; amended README. 2020-01-23 08:43:49 +00:00
4d5f1d553d Updated some obsolete dependencies
(probably more need to be updated).
2020-01-23 08:26:57 +00:00
jem
95ee7e13eb make error handling more user friendly 2019-02-13 08:15:53 +01:00
89b7597418 Merge branch 'release/1.0.2' into develop 2019-01-19 17:46:44 +00:00
8374432a16 Added change log 2019-01-19 17:46:33 +00:00
5b785389b4 Version 1.0.2 2019-01-19 17:20:50 +00:00
2df4931fbe Merge remote-tracking branch 'origin/develop' into develop 2019-01-19 17:05:41 +00:00
Simon Brooke
01982fdb11
Merge pull request #38 from DomainDrivenArchitecture/fix_resource_handling
fix rings & noirs resource upload & serve location
2019-01-19 16:59:17 +00:00
33c0398138 Merge remote-tracking branch 'origin/develop' into develop 2019-01-19 16:43:39 +00:00
Simon Brooke
b1eeecde1d
Merge pull request #39 from DomainDrivenArchitecture/Configurable_intro_page
make start page configurable
2019-01-19 16:41:47 +00:00
jem
4f8c4b8925 fixed test - Now we are getting a 200 response again. 2019-01-18 15:06:33 +01:00
Vlad Bokov
3542ac9146
Prefer content-dir files over classpath (like /content/stylesheet.css) 2019-01-18 07:05:19 +07:00
jem
fad1fcfea5 make start page configurable 2019-01-08 19:59:16 +01:00
jem
1136e792d4 fix rings & noirs resource upload & serve location 2019-01-08 17:42:24 +01:00
Simon Brooke
4026e23946
Merge pull request #36 from DomainDrivenArchitecture/include_doc
Include doc added to README
2018-05-28 12:48:31 +01:00
jem
77d77ed334 minor doc add in README 2018-05-25 17:21:32 +02:00
jem
7e5b3d74da spelling & format fixes for README 2018-05-25 17:19:33 +02:00
jem
7b284eb13f Added include doc 2018-05-25 17:15:46 +02:00
f3456d819c Upversion to 1.0.2-SNAPSHOT 2018-05-24 08:28:37 +01:00
a8cf3ee0ea Merge branch 'master' into develop 2018-05-24 08:27:42 +01:00
05eafe603f Minor: alphorder requirements, documentation spelling. 2018-05-24 08:26:37 +01:00
880b174766 Merge remote-tracking branch 'origin/master' 2018-05-24 08:06:06 +01:00
d1cf584a38 Merge branch 'release/1.0.1' 2018-05-24 08:05:47 +01:00
5c241abecd Merge branch 'release/1.0.1' into develop 2018-05-24 08:05:46 +01:00
Simon Brooke
e4b82f93fb
Merge pull request #35 from DomainDrivenArchitecture/include-feature
Include feature
2018-05-24 08:05:16 +01:00
40f299b43d Version 1.0.1 2018-05-24 07:26:39 +01:00
56aa8ca2f1 Merge remote-tracking branch 'origin/develop' into develop 2018-05-24 07:25:00 +01:00
778c0a84e2 i18n 2018-05-24 07:23:11 +01:00
jem
01c954fc2f fix uri resolving 2018-05-22 21:22:58 +02:00
jem
7674a4c305 stick system together 2018-05-22 18:01:22 +02:00
jem
3668b26df1 add doc to namespaces 2018-05-22 16:59:43 +02:00
jem
535465c362 implement indention 2018-05-18 20:47:15 +02:00
jem
12d4661db9 expectation for header & list indent 2018-05-18 17:17:15 +02:00