 Jan Tuomi
|
160f5adc59
|
Merge branch 'develop' into 'master'
Add filtering to coffee data
See merge request !43
|
2017-09-19 21:05:07 +03:00 |
|
|
Jan Tuomi
|
7570d0c131
|
Add filtering to coffee data
|
2017-09-19 21:04:48 +03:00 |
|
|
Jan Tuomi
|
b8267e411c
|
Merge branch 'develop' into 'master'
Fix logging in all modules
See merge request !42
|
2017-09-19 19:32:06 +03:00 |
|
|
Jan Tuomi
|
f534244dd8
|
Fix logging in all modules
|
2017-09-19 19:31:43 +03:00 |
|
|
Jan Tuomi
|
ab2fcf04eb
|
Merge branch 'develop' into 'master'
Attempt to hotfix coffee scale crash
See merge request !41
|
2017-09-19 17:02:36 +03:00 |
|
|
Jan Tuomi
|
b507bc5f27
|
Attempt to hotfix coffee scale crash
|
2017-09-19 17:01:56 +03:00 |
|
|
Jan Tuomi
|
4a79ed341e
|
Merge branch 'develop' into 'master'
Develop
See merge request !40
|
2017-09-19 00:06:29 +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
|
7b8c5f3d8f
|
Merge branch 'develop' into 'master'
Move coffee scale to web2.0
See merge request !39
|
2017-09-18 23:17:11 +03:00 |
|
|
Jan Tuomi
|
5da4b52bde
|
Move coffee scale to web2.0
|
2017-09-18 23:16:19 +03:00 |
|
|
Jan Tuomi
|
170635a8db
|
Merge branch 'develop' into 'master'
Fix translation import issue
See merge request !38
|
2017-09-18 20:21:58 +03:00 |
|
|
Jan Tuomi
|
7bdd970845
|
Fix translation import issue
|
2017-09-18 20:20:21 +03:00 |
|
|
Jan Tuomi
|
a86f71b422
|
Merge branch 'develop' into 'master'
Develop
Closes #71 and #72
See merge request !37
|
2017-09-18 19:10:09 +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 |
|
|
Jan Tuomi
|
e5d2520454
|
Add dind service
|
2017-09-15 16:31:15 +03:00 |
|
|
Jan Tuomi
|
54090c9cb0
|
Let's try this again
|
2017-09-15 16:29:33 +03:00 |
|
|
Jan Tuomi
|
1dfa7ae352
|
Add docker installation to CI
|
2017-09-15 16:02:35 +03:00 |
|
|
Jan Tuomi
|
26ee4bbfea
|
Add docker-compose to CI
|
2017-09-15 15:52:55 +03:00 |
|
|
Jan Tuomi
|
5e98932132
|
Fix .gitlab-ci.yml
|
2017-09-15 15:42:48 +03:00 |
|
|
Jan Tuomi
|
b0235d6089
|
Add deployment stuffs
|
2017-09-15 15:40:17 +03:00 |
|
|
Jan Tuomi
|
2c9c1a76c8
|
Remove runserver from deploy config
|
2017-09-14 19:25:45 +03:00 |
|
|
Jan Tuomi
|
41c9aab595
|
Add automatic deployment
|
2017-09-14 15:55:39 +03:00 |
|
|
Juhana Luomanen
|
b16bef536e
|
Fix admin site header. Resolve issue #71
|
2017-09-13 19:44:44 +03:00 |
|
|
Aarni
|
d438c7b16a
|
Use more appropriate fields instead of TextFields
Fix issue #72
|
2017-09-13 18:44:17 +03:00 |
|
|
Jan Tuomi
|
4f62dce814
|
Use django-auditlog 😏
|
2017-06-17 13:47:31 +03:00 |
|
|
Jan Tuomi
|
c9aef9dba4
|
Created audit log models
|
2017-06-15 19:32:17 +03:00 |
|
|
Jan Tuomi
|
cc3564bf42
|
Fix pep8 errors
|
2017-06-08 09:29:27 +03:00 |
|
|
Jan Tuomi
|
94c2c16874
|
Add missing migrations
|
2017-06-08 09:25:03 +03:00 |
|
|
Joel Lavikainen
|
81deba5472
|
Add kaehmy models to admin
|
2017-06-07 19:21:28 +03:00 |
|
|
Joel Lavikainen
|
543d432154
|
Add kaehmyform and message
|
2017-06-07 19:14:57 +03:00 |
|