Commit Graph

87 Commits

Author SHA1 Message Date
henu 43e54af141 Fix webapp and sikweb py files pep8 2017-09-20 21:15:46 +03:00
Jan Tuomi f534244dd8 Fix logging in all modules 2017-09-19 19:31:43 +03:00
Jan Tuomi 5da4b52bde Move coffee scale to web2.0 2017-09-18 23:16:19 +03:00
Jan Tuomi f800f5c342 Allow all hosts on dev server 2017-09-15 20:58:46 +03:00
Jan Tuomi 12027a5a80 Fix things 2017-09-15 20:11: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
Ilkka Oksanen bd0522f79a Rework webapp models and add translation framework 2017-06-07 18:38:04 +03:00
Jan Tuomi 5c8dfdfd1d Add settings value for automatic emails
Resolves #54
2017-05-29 23:26:36 +03:00
Jan Tuomi 9276f4cafb Merge feature-sidebar with conflicts 2017-05-27 11:30:22 +03:00
Jan Tuomi 12d7ca0835 Fix settings error 2017-05-27 11:13:29 +03:00
henu 54612e31ca Add REST API support to members
Members can be now retrieved one at a time is user has admin rights.
Implemented also permissions and throttle rates to REST API and added
required settings.py modifications to settings-sample.py file.
2017-05-25 17:06:44 +03:00
Aarni 2834da0934 Email new member on request and accept 2017-05-24 21:03:55 +03:00
Jan Tuomi 128342c678 Add about.html because Jopi forgot 2017-05-24 20:08:18 +03:00
Jan Tuomi 1410c2e2a5 Upgrade to Django 1.11
Resolves #48
2017-05-21 18:08:38 +03:00
Jan Tuomi a2fb923220 Fix all pep8 and eslint errors :0 2017-05-21 16:28:47 +03:00
Jan Tuomi 30ca4aafd3 Exclude migrations from nose and pep8 2017-05-19 16:03:38 +03:00
Jan Tuomi dd61231837 Fix file name problem in CI 2017-05-18 16:16:27 +03:00
Jan Tuomi c64cf7a7cc Clean up repo and remove docker 2017-05-18 15:49:04 +03:00
okalintu 7736c6397f Change psql to settings replacing mariadb 2017-05-17 17:35:08 +03:00
Jan Tuomi 4518228d69 Edit GitLab CI 2017-05-17 14:33:08 +03:00
Jan Tuomi 9a87ba56b5 Start using django_tables2 for table processing 2017-05-13 00:18:01 +03:00
Jan Tuomi 189f0dd30d Use Django forms in members, WIP 2017-05-11 09:01:30 +03:00
Jan Tuomi 7e2cf03ced Merge remote-tracking branch 'origin/feature-postgres' into develop 2017-05-10 19:37:18 +03:00
Jan Tuomi 1974af3723 Merge branch 'urls-makeover' into develop 2017-05-10 19:30:54 +03:00
okalintu 33cf10c556 Change default email sender to comply with django 2017-05-10 17:10:54 +03:00
okalintu fbd5d637a8 Tune autoinstall script and settings to postgres 2017-04-07 20:39:18 +03:00
Jan Tuomi 3f73a94b83 Separate urls.py into modular pieces 2017-04-06 21:03:43 +03:00
okalintu ced6f648b2 Add Apyitem + urls to backend 2017-03-29 17:42:27 +03:00
okalintu ba02327591 Add url to serve ÄPY statistics 2017-03-29 17:26:25 +03:00
Jan Tuomi 435d96112e Merge branch 'master' into develop 2017-03-29 16:13:14 +03:00
okalintu 0e8cad7589 Add barebone skeleton for infoscreens event view 2017-03-29 13:53:48 +03:00
Joel Lavikainen 306a5b48a1 Modify coffeeinfoitem into generic websiteinfoitem
Resolve #31
2017-03-08 18:30:38 +02:00
Jan Tuomi 08b4c17044 Revert "[Members] Made frontend to use mainly rest api"
This reverts commit 75418da403.
2017-03-08 17:23:41 +02:00
Jan Tuomi 307ddbdca6 Add one click installer scripts/autoinstall.sh 2017-03-03 12:21:45 +02:00
Jan Tuomi bf9aad4f4c Add coverage test module django_nose 2017-03-02 13:10:17 +02:00
Henri Varjotie 75418da403 [Members] Made frontend to use mainly rest api 2017-03-01 18:41:41 +02:00
henu bb206712e4 Implemented rest api to member requests 2017-02-22 18:37:34 +02:00
henu 4beefd13a4 Added django rest framework to members 2017-02-22 17:13:15 +02:00
Jan Tuomi 5fc218323c Fix deprecation warnings 2017-02-22 15:43:19 +02:00
Juhana bafc094f40 Add missing setting entries 2017-02-22 15:31:09 +02:00
Juhana beb36064f9 Add entry to urls.py for media files 2017-02-22 15:19:15 +02:00
Jan Tuomi 255b3bfe83 Add dummy SIKAdmin at /sikadmin 2017-02-12 00:49:22 +02:00
Jan Tuomi 85a7415c5c Add missing options to settings-sample.py 2017-02-10 18:58:29 +02:00
Jan Tuomi 09ada09723 Merge branch 'template-overhaul' into develop 2017-02-10 18:54:23 +02:00
Jan Tuomi 7ee3f69740 Add footer with language controls
Also add a project wide global_static directory at the root for storing
project wide static files. Add some translations for the member register
app.
2017-02-06 01:10:25 +02:00
Jan Tuomi c34e31c0e5 Add some translations for i18n 2017-02-05 23:02:04 +02:00
Jan Tuomi 8f4c8701ae Fix CORS header issue in infoscreen 2017-02-05 18:27:46 +02:00
Jan Tuomi 990d6b853f Move templates in members app to templates dir
This is kind of a huge, monolithic commit. Templates were being served
as static files, so Django template tags could not be used for, e.g.
internationalization. Now all html files are served as Django templates.
2017-02-05 16:39:49 +02:00
Tatoma e5e284b80d Add coffeeinfoitem
Serve ka.dy.fi in iframe as infoitem. Resolves #29.
2017-02-01 19:21:56 +02:00