671 Commits

Author SHA1 Message Date
Frank Hamand
dc04a058c5 Merge pull request #506 from skylerbunny/productionenv
Update production.env.example documentation and ordering
2017-05-02 13:31:42 +01:00
skylerbunny
f683256f36 Disable SMTP SSL when TLS is enabled in example config 2017-05-02 05:18:11 -07:00
Frank Hamand
60ee92d3c4 Fix links in profile settings side bar
They were relative so would take you to e.g.

  /user/1/profile/General/General

Then

  /user/1/profile/General/General/General

etc
2017-05-02 12:24:36 +01:00
Skyler Bunny
3aacd7c481 Add additional settings to production.env.example 2017-04-29 06:39:13 -07:00
Skyler Bunny
417b8bbf98 Update production.env.example documentation and ordering 2017-04-29 06:17:39 -07:00
Frank Hamand
de4470fd38 0.10.5 0.10.5 2017-04-28 11:28:19 +01:00
Frank Hamand
a198d0c704 Update changes for snapshots fix 2017-04-28 11:13:32 +01:00
Frank Hamand
d000079a48 Order recent snapshots by time
This breaks some graphs sometimes if snapshots are out of order
2017-04-28 11:12:51 +01:00
Frank Hamand
8626df688d Merge pull request #502 from nickromano/nr/persist-local-postgres-data
Persist postgres data between runs using docker-compose
2017-04-28 11:00:27 +01:00
Nick Romano
d6b65d7f63
Github org single-sign-on 2017-04-27 19:57:56 -07:00
Nick Romano
9487754b00
Github enterprise org single-sign-on 2017-04-27 17:13:30 -07:00
Nick Romano
0d3b09c058
Persist postgres data between runs using docker-compose 2017-04-27 14:37:08 -07:00
Frank Hamand
7caa2cada4 Fix default.env not being sourceable
It had invalid syntax due to angle brackets
2017-04-26 13:21:17 +01:00
Frank Hamand
f86ec4b604 Update changes for complex calendar issue 2017-04-26 13:07:18 +01:00
Frank Hamand
ccdd069721 Merge pull request #498 from FutureProofGames/fix-complex-recurring-calendar
Fix complex recurring calendar
2017-04-26 13:06:33 +01:00
Frank Hamand
825644180f Fix css regression in logo/title
Since upgrading bootstrap the logo is display: block instead of inline,
which causes the title to render in the wrong place
2017-04-26 11:45:06 +01:00
Gregory Avery-Weir
151f142784 Fix issue with complex recurring calendar 2017-04-26 00:10:01 -04:00
Gregory Avery-Weir
3c3afcc130 Merge remote-tracking branch 'upstream/master'
Conflicts:
	cabot/cabotapp/calendar.py
	cabot/cabotapp/tests/tests_basic.py
2017-04-25 23:58:00 -04:00
Frank Hamand
1555b7c9c9 0.10.4 0.10.4 2017-04-21 18:43:18 +01:00
Frank Hamand
2dc92a6e4b Merge pull request #494 from arachnys/fix-alert-test-duty
Fix alert tests alerting the duty officer
2017-04-21 18:42:20 +01:00
Frank Hamand
c2de2c3b19 Fix alert tests alerting the duty officer 2017-04-21 18:41:27 +01:00
Frank Hamand
cfc0222422 Merge pull request #495 from arachnys/password-bug
Fix password input bug.
2017-04-21 18:39:27 +01:00
Cédric Cordenier
5fae950b7a Fix password input bug.
By default, Django doesn't render field value for PasswordInput widgets, which means the password field will get overwritten
by an empty string every time a check is edited.

To fix this, we check whether the input is empty and don't modify the password if it is.
2017-04-21 18:39:08 +01:00
Frank Hamand
3008346291 0.10.3 0.10.3 2017-04-21 10:49:57 +01:00
Frank Hamand
768c763aae Merge pull request #488 from arachnys/plugin-settings
Add Plugin settings with Alert Tests
2017-04-21 10:48:29 +01:00
Frank Hamand
f3203e571b Add 'ALERT_TEST' check during alert tests
This makes the notification that gets created more obvious, as it will
show ALERT_TEST as the failing check
2017-04-19 09:58:28 +01:00
Frank Hamand
a6171d68d3 Add missing font files 2017-04-19 09:58:28 +01:00
Frank Hamand
fb033beaee User get_user_model instead of User 2017-04-19 09:58:28 +01:00
Frank Hamand
082b943460 Update changes 2017-04-19 09:58:28 +01:00
Frank Hamand
6cd6a5dbc8 Add tests for plugin settings and alert tests 2017-04-19 09:58:28 +01:00
Frank Hamand
b73da11d87 Add plugin settings form template 2017-04-19 09:58:28 +01:00
Frank Hamand
f457f76ae1 Increase chosen field width to 100%
They are currently tiny for select boxes. We can still control width
with a wrapper element
2017-04-19 09:58:27 +01:00
Frank Hamand
9ad44129fe Fix AlertPlugin settings update form views
The post view was still a copy of the user profile settings view
2017-04-19 09:58:27 +01:00
Frank Hamand
6953572fb5 Make AlertPlugin title not able to be blank
I accidentally created a blank alert plugin and it broke some pages as
we use the plugin title in some urls
2017-04-19 09:58:27 +01:00
Frank Hamand
0159cb79c0 Show alerts as disabled if the plugin is disabled 2017-04-19 09:58:27 +01:00
Frank Hamand
89bb99a5e5 Add Plugin settings views with Alert tests 2017-04-19 09:58:27 +01:00
Frank Hamand
58156eadf2 Add bootstrap-chosen
Makes chosen select boxes look much nicer
2017-04-19 09:58:27 +01:00
Frank Hamand
8c9cb3af8b Filter alerts on enabled=True
Currently we have an enabled flag on alert plugins but its never used.
2017-04-19 09:58:27 +01:00
Frank Hamand
3a68bb5cdf Change send_alert method to _send_alert proxy method
This makes testing easier/better as we can mock the _send_alert method
on the super class and not worry about mocking all the subclasses
2017-04-19 09:58:27 +01:00
Frank Hamand
83320e5179 Update bootstrap
We were missing some glyphicons due to old version of bootstrap.
Specifically, i wanted to use glyphicon-equalizer for the pluggins
settings icon
2017-04-19 09:58:27 +01:00
Frank Hamand
e24f0cf026 Make bin/test_with_coverage executable 2017-04-19 09:58:22 +01:00
Frank Hamand
fe8d30354e Fix travis test command 2017-04-19 09:57:18 +01:00
Frank Hamand
0597d4db34 Change test compose command with entrypoint
This means you can add e.g. --failfast, or run specific tests
2017-04-19 09:35:39 +01:00
Frank Hamand
24b5f1ca0a Merge pull request #489 from arachnys/fix-polymorphic-bug
Rollback to Django 1.10
2017-04-17 12:18:36 +01:00
Frank Hamand
b208a28f21 Rollback django 1.11 change
It doesn't work with django polymorphic
2017-04-16 21:39:03 +01:00
Frank Hamand
c2e1607de4 Add test for django polymorphic regression
Django 1.11 introduced a django polymorphic regression, add a test
to prevent this creeping back in
2017-04-16 21:32:18 +01:00
Frank Hamand
5a4f871eaa Merge pull request #484 from arachnys/django-1.11
Upgrade to Django 1.11
2017-04-05 15:15:58 +01:00
Frank Hamand
f99ef6d445 Upgrade to django 1.11
This requires a bump in django filter which needs django_filters adding
to INSTALLED_APPS
2017-04-05 15:15:38 +01:00
Frank Hamand
a5af188372 Remove dodgy plugin update test
This was always a bit dodge and didn't work before django 1.8 and now
doesn't work in django 1.11. Plugin changes should require a server
restart anyway
2017-04-05 14:21:27 +01:00
Jean-Fred Berthelot
976e263079 Bump Pytz to latest version 2017.2
Released on 2017-03-30
2017-04-04 17:03:19 +02:00