237 Commits

Author SHA1 Message Date
81cb4416b9 Merge branch 'app.wiai.de' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de 2018-04-09 13:07:06 +02:00
michigg
04982daff2 Fix importer bug 2018-04-09 13:03:25 +02:00
michigg
1e8035d1c3 Merge branch 'app.wiai.de' 2018-04-07 23:02:20 +02:00
e8198bc0df Merge branch 'app.wiai.de' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de 2018-04-04 18:52:28 +02:00
michigg
fe16949725 Change conflicting static url 2018-04-04 18:51:19 +02:00
34f5e39b83 Merge branch 'master' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de 2018-04-03 13:12:42 +02:00
michigg
f82cb1bc0a Add migrations 2018-04-03 12:55:48 +02:00
michigg
9f20cc5fe3 Merge branch 'master' into app.wiai.de 2018-04-03 12:53:55 +02:00
michigg
98e6486883 Add logging 2018-04-03 12:53:38 +02:00
michigg
213496fa3e Add logging, Refractor importer 2018-04-01 17:35:55 +02:00
michigg
e9bc6da951 Refractor settings, Extract env variables 2018-04-01 12:59:41 +02:00
michigg
df7649c3e6 Update comment, image, rating endpoints 2018-03-31 23:00:07 +02:00
michigg
c6e0418a34 Implement djoser 2018-03-31 22:59:26 +02:00
michigg
f4dd21440f Update food api, fix query proplems 2018-03-31 22:58:33 +02:00
michigg
9b5d294703 Add new api urls 2018-03-28 15:21:51 +02:00
michigg
51f850e40c Update food i don't care 2018-03-28 15:21:24 +02:00
michigg
e57399b7f1 Update model with new API standards 2018-03-28 15:20:37 +02:00
michigg
4fd22aed1d Start api v1.2 2018-03-28 15:18:54 +02:00
michigg
e2e2e0b0bf Update registration for api auth 2018-03-28 15:18:04 +02:00
michigg
44ffe4577f Update settings for authentication 2018-03-28 14:48:58 +02:00
michigg
4b35667623 Update food views 2018-03-28 14:47:47 +02:00
michigg
ab2c050ae6 Remove univis check files, Refractor api 2018-03-28 14:39:55 +02:00
michigg
73e77e2545 Configure email logging 2018-03-22 17:32:27 +01:00
michigg
4bda3fa5fb Update parser, Implement logging 2018-03-22 17:22:42 +01:00
michigg
0be7701451 Add formular description 2018-03-22 14:53:56 +01:00
michigg
a507ccec36 Disable disabled links 2018-03-22 14:53:08 +01:00
michigg
8e1ad80ed0 Update copyright 2018-03-22 14:40:40 +01:00
michigg
3fd46c94d7 Disable non official links 2018-03-22 14:39:26 +01:00
Michael Götz
1b03a73b75 Merge branch 'master' into app.wiai.de 2018-02-05 00:18:21 +01:00
Michael Götz
a39dac8363 Update gitignore 2018-02-05 00:16:25 +01:00
Michael Götz
2150bf5b74 Add food api today test 2018-02-05 00:13:52 +01:00
Michael Götz
d300ead723 Add food api test 2018-02-03 11:52:44 +01:00
Michael Götz
831991518f Add food api tests 2018-02-03 00:47:55 +01:00
Michael Götz
267cbd5bfd Remove happy hours 2018-02-01 13:17:36 +01:00
Michael Götz
0302612ee6 Merge branch 'master' into app.wiai.de 2018-02-01 11:44:13 +01:00
Michael Götz
16dbf49d6e Fix #17 and change food images to thumbs 2018-02-01 11:43:33 +01:00
Michael Götz
c002b7a20a Update gitignore rm migrations 2018-02-01 11:22:33 +01:00
Michael Götz
31e636abb8 Merge branch 'django2' 2018-02-01 11:11:40 +01:00
Michael Götz
df16432203 Change deafault images location to static 2018-02-01 11:07:12 +01:00
Michael Götz
ec6e70df23 Could be a new test case 2018-02-01 10:03:25 +01:00
clemens
8739f7c440 migrate to django 2.0 2018-01-22 20:31:45 +01:00
clemens
987b1e8baa fix issues surfaced with postgres 2018-01-22 11:07:02 +01:00
Michael Götz
88dfa86fe0 Change model max sizes 2018-01-17 01:18:33 +01:00
clemens
6b3fb138bc ...again 2018-01-15 11:25:55 +01:00
clemens
772a96f28f set STATICROOT for production mode 2018-01-15 11:20:30 +01:00
clemens
edbf9d0f0f fix volume 2018-01-15 10:42:16 +01:00
clemens
365ed3c04a Merge branch 'master' into app.wiai.de 2018-01-15 10:31:28 +01:00
Michael Götz
b87f6ac56b Fix image hack 2018-01-13 02:09:00 +01:00
Michael Götz
fed22f53a1 Change file food names to food_ids 2018-01-12 23:55:15 +01:00
Michael Götz
0ce1b2edbc Fix shity bugs 2018-01-12 23:53:01 +01:00