 Oliver Marks
|
08b932d9af
|
Updated configuration
|
2018-01-27 12:43:12 +00:00 |
|
Oliver Marks
|
2b8fd8b73f
|
Add x attribute
|
2018-01-27 09:37:16 +00:00 |
|
Oliver Marks
|
bf3a5170b4
|
Add bucket container to stge and live remove node container
|
2018-01-26 20:02:24 +00:00 |
Oliver Marks
|
b662c38607
|
adjusted config for local and prod
|
2018-01-26 13:53:42 +00:00 |
|
Oliver Marks
|
e2dc3f331d
|
Add in place holder files
|
2018-01-26 13:20:21 +00:00 |
|
Oliver Marks
|
bff7fe8950
|
Updated readme with backup info
|
2018-01-26 07:36:08 +00:00 |
|
Oliver Marks
|
70589679a6
|
Updated deploy steps
|
2018-01-25 21:45:13 +00:00 |
|
Oliver Marks
|
26f948d7a9
|
test deploy settings
|
2018-01-25 21:13:45 +00:00 |
|
Oliver Marks
|
f77a1d75c7
|
remove old package file, update drone config
|
2018-01-25 20:59:53 +00:00 |
|
Oliver Marks
|
f466e80d2a
|
Fixed top nav to work with bootstrap 4
|
2018-01-25 20:09:14 +00:00 |
|
Oliver Marks
|
0b2f333ad7
|
Bootstrap 4 final release update
|
2018-01-25 14:19:33 +00:00 |
|
Oliver Marks
|
ce976ccfb1
|
Merge branch 'tests'
|
2018-01-24 22:55:08 +00:00 |
|
Oliver Marks
|
c1c9dcc38b
|
Add collect static and compile scss
|
2018-01-24 22:37:02 +00:00 |
|
Oliver Marks
|
bbbaf1ffc9
|
Add collect static and compile scss
|
2018-01-24 13:58:28 +00:00 |
|
Oliver Marks
|
1e18c2d2e0
|
Fix final test
|
2018-01-24 13:28:00 +00:00 |
|
Oliver Marks
|
5008051d88
|
Fixup tests into working state one left to fix
|
2018-01-23 22:07:43 +00:00 |
|
Oliver Marks
|
bf695f823d
|
Add stage to allowed hosts
|
2018-01-23 07:15:19 +00:00 |
|
Oliver Marks
|
8ec2e5cd29
|
Remove volume causing permission issues
|
2018-01-22 22:36:02 +00:00 |
|
Oliver Marks
|
9a25b90f06
|
remove copy pasta in config
|
2018-01-22 21:12:44 +00:00 |
|
Oliver Marks
|
84db2d43d9
|
Add useful commands to readme, chane ownership of log file
|
2018-01-22 21:11:09 +00:00 |
|
Oliver Marks
|
52bab868ff
|
Changes to allow local bucket work inside and outside container
|
2018-01-22 14:31:54 +00:00 |
|
Oliver Marks
|
276a87c0b3
|
Now on the bucket list :)
|
2018-01-21 21:06:51 +00:00 |
|
Oliver Marks
|
c3f9a377c9
|
Fixes to make django markdown work with the wiki
|
2018-01-20 14:29:04 +00:00 |
|
Oliver Marks
|
61ca8968ae
|
Requests form updated
|
2018-01-18 21:44:49 +00:00 |
|
Oliver Marks
|
85dfd065e6
|
Merge branch 'requests'
|
2018-01-18 18:57:08 +00:00 |
|
Oliver Marks
|
7d67e9e9e5
|
requests wip
|
2018-01-18 14:12:23 +00:00 |
|
Oliver Marks
|
67facc06f1
|
Fix for martor markdown display.
|
2018-01-16 22:12:50 +00:00 |
|
Oliver Marks
|
9d50b92f40
|
Fix up user rfid urls
|
2018-01-15 18:32:19 +00:00 |
|
Oliver Marks
|
1fb2b65df2
|
Added flag to track completed equipment requests
|
2018-01-14 18:25:02 +00:00 |
|
Oliver Marks
|
afdb834daf
|
Disable django wiki login pages and use the default django pages
|
2018-01-06 21:11:58 +00:00 |
|
Oliver Marks
|
9f9f9e4795
|
Updated draceditor to martor, project was renamed.
|
2018-01-06 20:59:38 +00:00 |
|
Sam Collins
|
8678c06108
|
Added basic creation and deletion buttons for RFID
|
2017-11-01 17:57:10 +00:00 |
|
Oly
|
8a2fa40f04
|
Change include to use custom django wiki temporarily
|
2017-10-30 13:41:36 +00:00 |
|
Oliver Marks
|
1c79734832
|
Merge pull request #166 from Brett78/master
Added rfid card listing and removed user drop down from rfid create form
|
2017-10-26 07:26:11 +01:00 |
|
brett
|
7ce5d0dbbf
|
Added rfid card listing and removed user drop down from rfid create form
|
2017-10-25 20:19:30 +01:00 |
|
Oliver Marks
|
79774498c2
|
Merge pull request #165 from Brett78/master
Update requests description CSS
|
2017-10-20 08:00:36 +01:00 |
|
brett
|
f9a99ccf47
|
Merge remote-tracking branch 'origin/master' into issue-153
|
2017-10-19 21:44:29 +01:00 |
|
brett
|
ad0fa959fa
|
Added new class to allow request descriptions to span the whole row
|
2017-10-19 20:58:26 +01:00 |
|
Oliver Marks
|
7751f5bfc5
|
Merge pull request #162 from ridders/master
Update home.html
|
2017-10-18 20:19:39 +01:00 |
|
Simon Ridley
|
0f4069a40a
|
Update home.html
Alteration to sentence.
|
2017-10-18 20:18:29 +01:00 |
|
Oliver Marks
|
b7127fbef2
|
Merge pull request #161 from olymk2/master
Increase pagination size, and change class from sm-2 to sm-12
|
2017-10-14 09:07:35 +01:00 |
|
Oliver Marks
|
1fe57ef0b4
|
Increase pagination size, and change class from sm-2 to sm-12
|
2017-10-14 09:06:41 +01:00 |
|
Oliver Marks
|
21f25d0aa6
|
Merge pull request #157 from olymk2/master
fix duplicate surname on membership card
|
2017-10-11 21:57:51 +01:00 |
|
Oliver Marks
|
95d78225e5
|
fix duplicate surname on membership card
|
2017-10-11 21:56:20 +01:00 |
|
Oliver Marks
|
3c505fd63e
|
Merge pull request #152 from Brett78/issue-137
Added missing migration files for register app
|
2017-10-08 09:40:23 +01:00 |
|
brett
|
e586ed772c
|
Added missing migration files for register app
|
2017-10-07 14:20:07 +01:00 |
|
Oliver Marks
|
5acf72a5fa
|
Merge pull request #150 from Brett78/issue-137
User register feature
|
2017-10-07 13:19:24 +01:00 |
|
Oliver Marks
|
8a3060641c
|
Merge pull request #151 from olymk2/master
Fixed amount display so its in pounds not pence, fixed cancel
|
2017-10-07 13:03:53 +01:00 |
|
Oliver Marks
|
9169c0dd52
|
Fixed amount display so its in pounds not pence, fixed cancel
|
2017-10-07 13:00:17 +01:00 |
|
brett
|
ac133ab67a
|
Removed unnecessary js script
|
2017-10-06 20:26:20 +01:00 |