David Taylor
|
7cc715cedc
|
Merge pull request #290 from nottinghamtec/hotfix/event-times-dissapearing
Hotfix/event times dissapearing
|
2017-05-16 15:15:50 +01:00 |
|
David Taylor
|
4b032944ac
|
Fix the time formatting
|
2017-05-16 14:50:33 +01:00 |
|
David Taylor
|
cb23fd183e
|
Add failing test
|
2017-05-16 14:50:18 +01:00 |
|
David Taylor
|
fbc039c274
|
Fix tests so they can actually run locally (I failed)
|
2017-05-16 13:58:05 +01:00 |
|
David Taylor
|
b3156dbb0d
|
Merge pull request #289 from nottinghamtec/feature/chrome-testing
Use Chrome for tests, and sauce-labs for CI integration tests
|
2017-05-15 21:56:09 +01:00 |
|
David Taylor
|
fdce2fa53d
|
Update selenium, use chrome for tests, and use sauce-labs for CI integration tests
|
2017-05-15 21:46:00 +01:00 |
|
David Taylor
|
55d24e96cb
|
Adds basic tests to check that versioning views load successfully
More comprehensive tests should be added when versioning.py is updated for the new version of django-reversion
|
2017-05-15 20:40:03 +01:00 |
|
David Taylor
|
7a4f5ba8bf
|
Merge pull request #217 from nottinghamtec/python-deps
[WIP] Update Python dependencies
|
2017-05-12 16:54:55 +01:00 |
|
David Taylor
|
16a993123b
|
Merge branch 'master' into python-deps
|
2017-05-12 16:49:14 +01:00 |
|
David Taylor
|
e547e3e858
|
Delete unused wercker config
|
2017-05-10 23:54:23 +01:00 |
|
David Taylor
|
ea26823fec
|
Add dependency badge to README
Add dependency badge to README
|
2017-05-10 23:45:54 +01:00 |
|
David Taylor
|
1f4e53ad27
|
Add dependency badge to README
|
2017-05-10 23:40:48 +01:00 |
|
David Taylor
|
374c31e8b4
|
Fix date/time/datetime field types
|
2017-05-10 23:03:35 +01:00 |
|
David Taylor
|
0d726b2b60
|
Fix paperwork printing
|
2017-05-10 20:25:41 +01:00 |
|
David Taylor
|
38a8ac1eb4
|
Add failing tests for event paperwork printing
|
2017-05-10 20:25:14 +01:00 |
|
David Taylor
|
872e5e72f3
|
Update the requirements.txt file, always a useful thing to do
|
2017-05-10 20:11:12 +01:00 |
|
David Taylor
|
d916c1ca19
|
Update all the things, and fix some upgrade issues
|
2017-05-10 20:05:36 +01:00 |
|
David Taylor
|
9b1cc965c7
|
Update to Django 1.10
|
2017-05-10 18:41:17 +01:00 |
|
David Taylor
|
83028418fe
|
Fix deprecation warnings for django 1.10
|
2017-05-10 18:30:17 +01:00 |
|
David Taylor
|
7f680dcffb
|
Fix activity feed
|
2017-05-10 18:06:17 +01:00 |
|
David Taylor
|
e573088c5e
|
Fix some issues caused by changes made over the last year
|
2017-05-10 17:51:55 +01:00 |
|
David Taylor
|
7ac9eef7a2
|
Merge master into python-deps
# Conflicts:
# PyRIGS/settings.py
# RIGS/admin.py
# RIGS/models.py
# RIGS/test_functional.py
# RIGS/urls.py
# requirements.txt
# wercker.yml
|
2017-05-10 17:32:21 +01:00 |
|
Tom Price
|
9b7c84cf08
|
Change invoice filename format
Change the invoice filename format to include the event number.
Closes #279
|
2017-03-28 16:58:06 +01:00 |
|
David Taylor
|
3269e92ef2
|
Merge pull request #277 from nottinghamtec/davidtaylorhq-patch-1
Explicitly define height in oembed JSON
|
2017-03-10 15:29:29 +00:00 |
|
David Taylor
|
0ae7bcaf7c
|
Explicitly define height in oembed JSON
|
2017-03-10 15:26:00 +00:00 |
|
Tom Price
|
9694d407ae
|
Merge pull request #275 from nottinghamtec/hotfix/home-links
Make forum go to actual forum
|
2017-02-06 15:47:12 +00:00 |
|
Sam Osborne
|
82aa2785ea
|
Make forum go to actual forum
Currently goes to old forum :(
|
2017-02-06 15:35:29 +00:00 |
|
David Taylor
|
337dbd74fd
|
Merge pull request #273 from nottinghamtec/hotfix/restore-pagination
Restore pagination to invoice waiting (requested by Emma)
|
2016-11-04 13:36:21 +00:00 |
|
David Taylor
|
caa55fe89a
|
Restore pagination to invoice waiting (requested by Emma)
|
2016-11-04 13:31:06 +00:00 |
|
David Taylor
|
289b30e823
|
Merge pull request #271 from nottinghamtec/hotfix/duplicate-message
Do not display "not saved" message when the event has been saved. Closes #151
|
2016-10-23 14:15:08 +01:00 |
|
David Taylor
|
b939bc5a64
|
Do not display "not saved" message when the event has been saved
|
2016-10-23 14:05:25 +01:00 |
|
David Taylor
|
5e8f2312d3
|
Merge pull request #270 from nottinghamtec/po-duplicate
Remove duplicated PO numbers, closes #256
|
2016-10-23 13:06:29 +01:00 |
|
David Taylor
|
90c8b19915
|
Added tests for PO non-duplication
|
2016-10-23 12:45:27 +01:00 |
|
David Taylor
|
d82ef3f8d1
|
Merge branch 'master' into master
|
2016-10-23 12:36:29 +01:00 |
|
David Taylor
|
fc006dc53e
|
Merge pull request #269 from johnathan99j/patch-1
Fix table display issue in README
|
2016-10-23 12:36:10 +01:00 |
|
Johnathan Graydon
|
3ce191aaf2
|
Update README.md
Small adjustment to make GitHub markdown display the table.
|
2016-10-23 12:26:35 +01:00 |
|
Johnathan Graydon
|
6fc89727f2
|
Stop PO number from duplicating when copying event
Would close #256
|
2016-10-21 15:48:54 +01:00 |
|
David Taylor
|
b235ac540f
|
Merge pull request #265 from nottinghamtec/ra-link
Add link to pre-event RA
|
2016-10-19 10:35:58 +01:00 |
|
Sam Osborne
|
97decf8c52
|
Add link to pre-event RA
#accessible
|
2016-10-19 00:54:42 +01:00 |
|
David Taylor
|
97cdf34c18
|
Merge pull request #263 from nottinghamtec/feature/forum-embed
Forum embed
|
2016-10-11 18:56:02 +01:00 |
|
Tom Price
|
92c77c07e0
|
Fix tailing line breaks
|
2016-10-11 18:47:13 +01:00 |
|
David Taylor
|
0541a70cec
|
Fixed event title link (_blank)
|
2016-10-09 11:30:13 +01:00 |
|
David Taylor
|
e0cb2f4925
|
Linked RIGS title
|
2016-10-09 11:26:32 +01:00 |
|
David Taylor
|
68a46af1a8
|
Fixed rounded corner fail
|
2016-10-09 11:22:34 +01:00 |
|
David Taylor
|
f61158b9c0
|
Rounded corners, transparent background
|
2016-10-09 11:20:43 +01:00 |
|
David Taylor
|
88954eca5c
|
Removed weird background from embed
|
2016-10-09 10:40:18 +01:00 |
|
David Taylor
|
3fc04616b3
|
Added test for cookie warning
|
2016-10-09 10:36:30 +01:00 |
|
David Taylor
|
2d5f768523
|
Added cookie check with nice error message
|
2016-10-09 10:32:58 +01:00 |
|
David Taylor
|
5949ff74ec
|
Added javascript cookie check, if blocked, login in new tab
|
2016-10-08 22:55:27 +01:00 |
|
David Taylor
|
879ecd1f6d
|
Made font size smaller in embed
|
2016-10-08 21:49:03 +01:00 |
|