 Jan Tuomi
|
bfc462a332
|
Merge develop to branch
|
2017-09-28 23:42:51 +03:00 |
|
|
Jan Tuomi
|
8f06190bd0
|
Use django-suit for SIK Admin
|
2017-09-28 23:36:12 +03:00 |
|
|
Jan Tuomi
|
285a0e7dbf
|
Fix decorators in webapp
|
2017-09-28 20:29:54 +03:00 |
|
|
Jan Tuomi
|
3901c21c67
|
Fix decorators in members
|
2017-09-28 20:28:19 +03:00 |
|
|
Jan Tuomi
|
69d26deef9
|
Rework infoscreen permissions
|
2017-09-28 20:16:26 +03:00 |
|
|
Jan Tuomi
|
75d9fb1dbb
|
Create new permission groups and fix member register permissions
|
2017-09-28 18:46:51 +03:00 |
|
|
Jan Tuomi
|
51a30d637f
|
WIP webapp permissions
|
2017-09-28 09:22:56 +03:00 |
|
|
Henri Varjotie
|
ff801f5e08
|
Merge branch 'feature-webapp-views' into 'develop'
Feature webapp views
See merge request !53
|
2017-09-27 19:53:43 +03:00 |
|
|
henu
|
5e4afb2fff
|
Add urls and views for navigation bar
|
2017-09-27 19:47:15 +03:00 |
|
|
henu
|
8028496b78
|
Add international and sosso pages.
|
2017-09-27 19:46:36 +03:00 |
|
|
henu
|
37ffd4fe0b
|
Add event calendar page.
|
2017-09-27 19:46:09 +03:00 |
|
|
henu
|
8a674bf527
|
Add contact page
|
2017-09-27 19:45:47 +03:00 |
|
|
henu
|
7c27365f1e
|
Add views and urls for jobs and freshmen
|
2017-09-27 19:24:30 +03:00 |
|
|
henu
|
8ce0b9a0d6
|
Add freshmen and jobs dummy pages
|
2017-09-27 19:23:34 +03:00 |
|
|
henu
|
55d0b11ec6
|
Add translations for main page views
|
2017-09-27 19:22:58 +03:00 |
|
|
henu
|
d0db00f9ad
|
Add Guild page template
|
2017-09-27 18:50:45 +03:00 |
|
|
Jan Tuomi
|
5e33a8e30c
|
Add tests for sähköpiikki API user
|
2017-09-26 15:30:23 +03:00 |
|
|
Jan Tuomi
|
61f5c293db
|
Implement token auth for sähköpiikki
|
2017-09-26 14:39:21 +03:00 |
|
|
Jan Tuomi
|
e10af28c4d
|
Remove unused log statement
|
2017-09-26 13:06:27 +03:00 |
|
|
Jan Tuomi
|
864b3787c8
|
Add sahkopiikki user create command
|
2017-09-26 11:30:34 +03:00 |
|
|
Jan Tuomi
|
d3e763aa05
|
Fix search logic for full names
|
2017-09-25 23:06:44 +03:00 |
|
|
Jan Tuomi
|
51e16df08b
|
Fix model form issues
|
2017-09-25 22:19:00 +03:00 |
|
|
Jan Tuomi
|
f6aa86d032
|
Add missing dependency
|
2017-09-25 22:00:48 +03:00 |
|
|
Jan Tuomi
|
982e6bf928
|
Add autocomplete search to "add payment" and add search bar to table views
|
2017-09-25 21:55:49 +03:00 |
|
|
Jan Tuomi
|
7ce28c3a48
|
Add autocomplete widget and fix some errors
|
2017-09-25 20:45:13 +03:00 |
|
|
Jan Tuomi
|
91a0694ae5
|
Fix timezone issues and create coffee view unit test
|
2017-09-25 19:45:58 +03:00 |
|
|
Jan Tuomi
|
e00f1edaa0
|
Fix pep8
|
2017-09-25 19:21:19 +03:00 |
|
|
Jan Tuomi
|
6954cc7f10
|
Refactor members views
|
2017-09-25 19:18:23 +03:00 |
|
|
Jan Tuomi
|
7eeec5da63
|
Add new translations
|
2017-09-25 13:41:26 +03:00 |
|
|
Teemu Mikkonen
|
42d51ca8ca
|
Fix for NaN message when coffee is brewing
|
2017-09-25 12:03:22 +03:00 |
|
|
Jan Tuomi
|
010fab5be1
|
Move static dir and fix eslint issues
|
2017-09-24 16:21:45 +03:00 |
|
|
Jan Tuomi
|
dd69a0c395
|
Split coffee.html to multiple files
|
2017-09-24 15:46:43 +03:00 |
|
|
Jan Tuomi
|
78bfa9fbcb
|
Add ALLOWED_HOSTS to sample settings
|
2017-09-24 15:28:22 +03:00 |
|
|
Jan Tuomi
|
ef58c8c98f
|
Split settings.py into 2
|
2017-09-24 13:42:27 +03:00 |
|
|
Jan Tuomi
|
518ea5bf7d
|
Add exception handling
|
2017-09-24 13:31:19 +03:00 |
|
|
Jan Tuomi
|
a11943aec6
|
Move MQTT settings to settings.py
|
2017-09-24 13:28:38 +03:00 |
|
|
Jan Tuomi
|
8b98dcf1ce
|
Delegate a bunch of logic to the ESP
|
2017-09-24 13:16:46 +03:00 |
|
|
Jan Tuomi
|
1c4be69964
|
Add pickle serializer to settings sample
|
2017-09-24 12:42:16 +03:00 |
|
|
Jan Tuomi
|
e5ca83a794
|
Merge branch 'feature-pep8-fixes' into 'develop'
Feature pep8 fixes
See merge request !45
|
2017-09-20 23:36:04 +03:00 |
|
|
Jan Tuomi
|
a99544f967
|
Fix more pep8 badlings
|
2017-09-20 23:35:41 +03:00 |
|
|
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 |
|