Commit a00ecacc authored by Jonathan Sambrook's avatar Jonathan Sambrook

Merge branch 'ebardie/smallupdates' into 'master'

A few small updates

See merge request !22
parents 4bad6169 8e5d4d02
......@@ -19,21 +19,21 @@ and Design.
### Requirements
![Requirements](https://github.com/CodethinkLabs/mustard/raw/master/data/screenshots/requirements.png "Requirements")
![Requirements](https://gitlab.com/trustable/mustard/raw/master/data/screenshots/requirements.png "Requirements")
### Architecture
![Architecture](https://github.com/CodethinkLabs/mustard/raw/master/data/screenshots/architecture.png "Architecture")
![Architecture](https://gitlab.com/trustable/mustard/raw/master/data/screenshots/architecture.png "Architecture")
### Work items
![Work Items](https://github.com/CodethinkLabs/mustard/raw/master/data/screenshots/work-items.png "Work Items")
![Work Items](https://gitlab.com/trustable/mustard/raw/master/data/screenshots/work-items.png "Work Items")
### History
![History](https://github.com/CodethinkLabs/mustard/raw/master/data/screenshots/history.png "History")
![History](https://gitlab.com/trustable/mustard/raw/master/data/screenshots/history.png "History")
![Diffs](https://github.com/CodethinkLabs/mustard/raw/master/data/screenshots/diff.png "Diffs")
![Diffs](https://gitlab.com/trustable/mustard/raw/master/data/screenshots/diff.png "Diffs")
## Mustard data format
......@@ -672,18 +672,29 @@ update.
## Contributing
Mustard is a Codethink Labs project. As such, its development takes
place within the Codethink Labs project on GitHub:
Mustard is a Codethink project as part of the [Trustable](https://trustable.io)
initiative. Its development takes place within the Trustable project on GitLab:
http://github.com/CodethinkLabs/mustard
https://gitlab.com/trustable/mustard
Anyone interested in improving Mustard is welcome to clone the project
repository and send pull requests.
## Codebase
An overview of the Mustard codebase:
[![Mustard's codebase](/data/mustard-codebase.svg.png)](/data/mustard-codebase.svg)
(At the time of writing GitLab can be finnicky about whether to display
SVG files either as an image or as XML text. So rather than linking
directly to the SVG file, to get a legible image when you've clicked
through to the SVG you will need to select the 'View Image' item,
or its equivalent in your browser, from the image's context menu.)
## Copyright & License
Copyright (C) 2012-2016 Codethink Ltd.
Copyright (C) 2012-2018 Codethink Ltd.
Mustard is licensed under the GNU Affero General Public License
Version 3, (AGPLv3). The full text of the license can be found
......
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/zesty64"
config.vm.box = "ubuntu/bionic64"
config.vm.network "private_network", type: "dhcp"
config.vm.synced_folder ".", "/src/mustard"
config.vm.synced_folder "../example-mustard", "/src/example-mustard", create: true
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment