Commit ff82252b authored by David Haynes's avatar David Haynes 🙆

Merge branch '2.2.1' into 'master'

2.2.1 Release

See merge request !101
parents adcc5c7d 393c306e
Pipeline #1519 failed with stages
in 1 minute and 47 seconds
......@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file. This
project adheres (to the best of our ability) to [Semantic Versioning](http://semver.org/).
## [2.2.1] - 2017-13-05
### Fixed
- Local development cache now uses a dummy
- LibreJS table now points to corect file location
- Package updates
## [2.2.0] - 2017-26-04
### Added
......
......@@ -147,44 +147,44 @@ SRCT Go • About
</tr>
</thead>
<tr>
<td><a href="{% static " js/jquery.min.js " %}">jquery.min.js</a></td>
<td><a href="{% static "js/jquery.min.js" %}">jquery.min.js</a></td>
<td><a href="http://jquery.org/license">Expat</a></td>
<td><a href="http://code.jquery.com/jquery-2.1.1.js">jquery-2.1.1.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/bootstrap.min.js " %}">bootstrap.js</a></td>
<td><a href="{% static "js/bootstrap.min.js" %}">bootstrap.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static " js/bootstrap.js " %}">bootstrap.js</a></td>
<td><a href="{% static "js/bootstrap.js" %}">bootstrap.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/clipboard.min.js " %}">clipboard.min.js</a></td>
<td><a href="{% static "js/clipboard.min.js" %}">clipboard.min.js</a></td>
<td><a href="https://zenorocha.mit-license.org/">Expat</a></td>
<td><a href="{% static " js/clipboard.js " %}">clipboard.js</a></td>
<td><a href="{% static "js/clipboard.js" %}">clipboard.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/copy.js " %}">copy.js</a></td>
<td><a href="{% static "js/copy.js" %}">copy.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static " js/copy.js " %}">copy.js</a></td>
<td><a href="{% static "js/copy.js" %}">copy.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/new_link.js " %}">new_link.js</a></td>
<td><a href="{% static "js/new_link.js" %}">new_link.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static " js/new_link.js " %}">new_link.js</a></td>
<td><a href="{% static "js/new_link.js" %}">new_link.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/tab.js " %}">tab.js</a></td>
<td><a href="{% static "js/tab.js" %}">tab.js</a></td>
<td><a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">Expat</a></td>
<td><a href="{% static " js/tab.js " %}">tab.js</a></td>
<td><a href="{% static "js/tab.js" %}">tab.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/tooltip.js " %}">tooltip.js</a></td>
<td><a href="{% static "js/tooltip.js" %}">tooltip.js</a></td>
<td><a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">Expat</a></td>
<td><a href="{% static " js/tooltip.js " %}">tooltip.js</a></td>
<td><a href="{% static "js/tooltip.js" %}">tooltip.js</a></td>
</tr>
<tr>
<td><a href="{% static " js/useradmin.js " %}">useradmin.js</a></td>
<td><a href="{% static "js/useradmin.js" %}">useradmin.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static " js/useradmin.js " %}">useradmin.js</a></td>
<td><a href="{% static "js/useradmin.js" %}">useradmin.js</a></td>
</tr>
</table>
</div>
......
......@@ -6,7 +6,7 @@
<a href="http://srct.gmu.edu/">GMU<strong> SRCT</strong></a>. |
Read and contribute to our <a href="https://git.gmu.edu/srct/go/">source code</a>. |
Freely-licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>. |
Go Version 2.2.0
Go Version 2.2.1
</span>
</div>
......@@ -21,7 +21,7 @@
Freely-licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
</div>
<div class="col-sm-4 text-muted">
Go Version 2.2.0
Go Version 2.2.1
</div>
</div>
</footer>
......@@ -16,3 +16,10 @@ from .base import *
DEBUG = True
CAS_SERVER_URL = "https://cas.srct.gmu.edu"
# dummy cache for development-- doesn't actually cache things
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
}
}
......@@ -8,7 +8,7 @@ git+https://github.com/dhaynespls/django-bootstrap3-datetimepicker.git
hashids==1.2.0
mysqlclient
redis==2.10.5
requests==2.13.0
requests==2.14.2
simplejson==3.10.0
six
setuptools==35.0.1
\ No newline at end of file
setuptools==35.0.2
\ No newline at end of file
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