 Jan Tuomi
|
68f587f776
|
Merge branch 'develop' into feature-pep8-fixes
|
2017-09-20 23:32:41 +03:00 |
|
|
Jan Tuomi
|
0b779c4799
|
Fix pep8 errors
|
2017-09-20 23:27:09 +03:00 |
|
|
Jan Tuomi
|
5d1238c23d
|
Change prints to logs
|
2017-09-20 23:19:50 +03:00 |
|
|
Jan Tuomi
|
b0edaae32e
|
Remove conflict resolver and add dynamic payments
|
2017-09-20 23:19:50 +03:00 |
|
|
henu
|
df4f1a8f56
|
Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-pep8-fixes
|
2017-09-20 21:16:47 +03:00 |
|
|
henu
|
43e54af141
|
Fix webapp and sikweb py files pep8
|
2017-09-20 21:15:46 +03:00 |
|
|
henu
|
08710b3705
|
Fix members pep8 and add docstrings
|
2017-09-20 21:00:58 +03:00 |
|
|
henu
|
ecc0ac965e
|
Fix infoscreen pep8 and add docstrings
|
2017-09-20 20:08:26 +03:00 |
|
|
Aarni
|
7a435bcbc6
|
Simple Ohlhafv challenge machine
|
2017-09-20 19:28:05 +03:00 |
|
|
Henri Varjotie
|
f738e76726
|
Merge branch 'feature-header-template' into 'develop'
Feature header template
See merge request !44
|
2017-09-20 19:11:53 +03:00 |
|
|
henu
|
e294707aed
|
Increase logo width to 100%
|
2017-09-20 18:52:57 +03:00 |
|
|
henu
|
593b380ecf
|
Add link to header img
|
2017-09-20 18:52:36 +03:00 |
|
|
henu
|
c811b65280
|
Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-header-template
|
2017-09-20 18:44:41 +03:00 |
|
|
henu
|
ec5c206c8e
|
Include header to base html file
|
2017-09-20 18:44:03 +03:00 |
|
|
henu
|
3b6f2988df
|
Add logo to header
|
2017-09-20 18:43:34 +03:00 |
|
|
henu
|
33215343ec
|
Add header logo and header css files
|
2017-09-20 18:42:56 +03:00 |
|
|
Aarni
|
e18f28ab7f
|
Migration file for max_length change
|
2017-09-20 18:09:09 +03:00 |
|
|
Aarni
|
5e4a41d52a
|
Unite some CharField max_lengths
|
2017-09-20 18:06:01 +03:00 |
|
|
Aarni
|
f006c6ceef
|
Fix JSONField and add migration files
|
2017-09-20 18:01:44 +03:00 |
|
|
henu
|
c0e8ba21ee
|
Create header template file
|
2017-09-20 17:50:57 +03:00 |
|
|
Aarni
|
62be06ea6e
|
Remove copypasta verbose_name
|
2017-09-20 17:46:05 +03:00 |
|
|
Aarni
|
68b37dea91
|
Registration model
|
2017-09-20 17:46:04 +03:00 |
|
|
Aarni
|
064b07e75a
|
Ohlhafv model
|
2017-09-20 17:46:04 +03:00 |
|
|
Jan Tuomi
|
7570d0c131
|
Add filtering to coffee data
|
2017-09-19 21:04:48 +03:00 |
|
|
Jan Tuomi
|
f534244dd8
|
Fix logging in all modules
|
2017-09-19 19:31:43 +03:00 |
|
|
Jan Tuomi
|
b507bc5f27
|
Attempt to hotfix coffee scale crash
|
2017-09-19 17:01:56 +03:00 |
|
|
Jan Tuomi
|
a63504619a
|
Add weird fix to MQTT module
|
2017-09-19 00:05:58 +03:00 |
|
|
Jan Tuomi
|
d4d63ac99d
|
Call fetch when opening coffee scale page
|
2017-09-18 23:59:49 +03:00 |
|
|
Jan Tuomi
|
a813b502fc
|
Random coffee scale fixes
|
2017-09-18 23:58:45 +03:00 |
|
|
Jan Tuomi
|
5da4b52bde
|
Move coffee scale to web2.0
|
2017-09-18 23:16:19 +03:00 |
|
|
Jan Tuomi
|
7bdd970845
|
Fix translation import issue
|
2017-09-18 20:20:21 +03:00 |
|
|
Jan Tuomi
|
f800f5c342
|
Allow all hosts on dev server
|
2017-09-15 20:58:46 +03:00 |
|
|
Jan Tuomi
|
040c9641ea
|
Prune old images on deploy host after deployment
|
2017-09-15 20:36:24 +03:00 |
|
|
Jan Tuomi
|
7e36fd5768
|
Change docker-compose pull to docker pull
|
2017-09-15 20:18:22 +03:00 |
|
|
Jan Tuomi
|
12027a5a80
|
Fix things
|
2017-09-15 20:11:44 +03:00 |
|
|
Jan Tuomi
|
84ca084533
|
Fuck bash
|
2017-09-15 19:31:45 +03:00 |
|
|
Jan Tuomi
|
572834f165
|
Use secret variables in CI jobs
|
2017-09-15 19:25:14 +03:00 |
|
|
Jan Tuomi
|
8c03fbbca9
|
Commit missing files
|
2017-09-15 19:15:49 +03:00 |
|
|
Jan Tuomi
|
754f108f57
|
Add remark
|
2017-09-15 19:13:17 +03:00 |
|
|
Jan Tuomi
|
adb152727e
|
Fix key permission problem
|
2017-09-15 18:50:30 +03:00 |
|
|
Jan Tuomi
|
ff778d15ee
|
Deploy only after publish
|
2017-09-15 18:41:58 +03:00 |
|
|
Jan Tuomi
|
f6afacb93f
|
Add ssh client to deploy stage
|
2017-09-15 18:32:02 +03:00 |
|
|
Jan Tuomi
|
ba795a2162
|
Split deploy to stages
|
2017-09-15 18:22:07 +03:00 |
|
|
Jan Tuomi
|
880114b214
|
Remove another brainfart
|
2017-09-15 18:05:06 +03:00 |
|
|
Jan Tuomi
|
8f3d10f5d0
|
Remove docker-compose dep from CI
|
2017-09-15 17:58:22 +03:00 |
|
|
Jan Tuomi
|
34a60e5458
|
Remove brainfart
|
2017-09-15 17:41:14 +03:00 |
|
|
Jan Tuomi
|
db637453b9
|
Remove installation of docker-compose from .gitlab-ci.yml
|
2017-09-15 17:27:09 +03:00 |
|
|
Jan Tuomi
|
8c71dbe2ed
|
Remove curl dependency
|
2017-09-15 17:12:23 +03:00 |
|
|
Jan Tuomi
|
04c69995ff
|
Try to fix openssh problems
|
2017-09-15 17:03:51 +03:00 |
|
|
Jan Tuomi
|
150c52a0fb
|
Add docker image to deploy stage
|
2017-09-15 16:45:51 +03:00 |
|