Commit Graph

  • bb4a30258c „README.md“ ändern app.wiai.de Götz 2019-09-25 21:56:06 +00:00
  • ab59b51cf4 Merge branch 'master' of https://git.michigg.de/BaStA/basta-server into app.wiai.de FSWIAI Docker Server 2018-06-05 01:43:17 +02:00
  • 61187ac073 Fix cafete parser michigg 2018-06-05 01:40:49 +02:00
  • ddf1fde2dc Update admin pages michigg 2018-04-17 18:36:01 +02:00
  • 5c09a4c6a1 Merge branch 'app.wiai.de' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de FSWIAI Docker Server 2018-04-17 00:47:52 +02:00
  • b228ba7ed9 Add bug report model and api michigg 2018-04-16 23:31:24 +02:00
  • 81cb4416b9 Merge branch 'app.wiai.de' of https://mg-server.ddns.net/git/BaStA/basta-server into app.wiai.de FSWIAI Docker Server 2018-04-09 13:07:06 +02:00
  • 04982daff2 Fix importer bug michigg 2018-04-09 13:03:25 +02:00
  • 1e8035d1c3 Merge branch 'app.wiai.de' michigg 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 FSWIAI Docker Server 2018-04-04 18:52:28 +02:00
  • fe16949725 Change conflicting static url michigg 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 FSWIAI Docker Server 2018-04-03 13:12:42 +02:00
  • f82cb1bc0a Add migrations michigg 2018-04-03 12:55:48 +02:00
  • 9f20cc5fe3 Merge branch 'master' into app.wiai.de michigg 2018-04-03 12:53:55 +02:00
  • 98e6486883 Add logging michigg 2018-04-03 12:53:38 +02:00
  • 213496fa3e Add logging, Refractor importer michigg 2018-04-01 17:35:55 +02:00
  • e9bc6da951 Refractor settings, Extract env variables michigg 2018-04-01 12:59:41 +02:00
  • df7649c3e6 Update comment, image, rating endpoints michigg 2018-03-31 23:00:07 +02:00
  • c6e0418a34 Implement djoser michigg 2018-03-31 22:59:26 +02:00
  • f4dd21440f Update food api, fix query proplems michigg 2018-03-31 22:58:33 +02:00
  • 9b5d294703 Add new api urls michigg 2018-03-28 15:21:51 +02:00
  • 51f850e40c Update food i don't care michigg 2018-03-28 15:21:24 +02:00
  • e57399b7f1 Update model with new API standards michigg 2018-03-28 15:20:37 +02:00
  • 4fd22aed1d Start api v1.2 michigg 2018-03-28 15:18:54 +02:00
  • e2e2e0b0bf Update registration for api auth michigg 2018-03-28 15:18:04 +02:00
  • 44ffe4577f Update settings for authentication michigg 2018-03-28 14:48:58 +02:00
  • 4b35667623 Update food views michigg 2018-03-28 14:47:47 +02:00
  • ab2c050ae6 Remove univis check files, Refractor api michigg 2018-03-28 14:39:55 +02:00
  • 73e77e2545 Configure email logging michigg 2018-03-22 17:32:27 +01:00
  • 4bda3fa5fb Update parser, Implement logging michigg 2018-03-22 17:22:42 +01:00
  • 0be7701451 Add formular description michigg 2018-03-22 14:53:56 +01:00
  • a507ccec36 Disable disabled links michigg 2018-03-22 14:53:08 +01:00
  • 8e1ad80ed0 Update copyright michigg 2018-03-22 14:40:40 +01:00
  • 3fd46c94d7 Disable non official links michigg 2018-03-22 14:39:26 +01:00
  • 1b03a73b75 Merge branch 'master' into app.wiai.de Michael Götz 2018-02-05 00:18:21 +01:00
  • a39dac8363 Update gitignore Michael Götz 2018-02-05 00:16:25 +01:00
  • 2150bf5b74 Add food api today test Michael Götz 2018-02-05 00:13:52 +01:00
  • d300ead723 Add food api test Michael Götz 2018-02-03 11:52:44 +01:00
  • 831991518f Add food api tests Michael Götz 2018-02-03 00:47:55 +01:00
  • 267cbd5bfd Remove happy hours Michael Götz 2018-02-01 13:17:36 +01:00
  • 0302612ee6 Merge branch 'master' into app.wiai.de Michael Götz 2018-02-01 11:44:13 +01:00
  • 16dbf49d6e Fix #17 and change food images to thumbs Michael Götz 2018-02-01 11:43:33 +01:00
  • c002b7a20a Update gitignore rm migrations Michael Götz 2018-02-01 11:22:33 +01:00
  • 31e636abb8 Merge branch 'django2' Michael Götz 2018-02-01 11:11:40 +01:00
  • df16432203 Change deafault images location to static Michael Götz 2018-02-01 11:07:12 +01:00
  • ec6e70df23 Could be a new test case Michael Götz 2018-02-01 10:03:25 +01:00
  • 8739f7c440 migrate to django 2.0 clemens 2018-01-22 20:31:45 +01:00
  • 987b1e8baa fix issues surfaced with postgres clemens 2018-01-22 11:07:02 +01:00
  • 88dfa86fe0 Change model max sizes Michael Götz 2018-01-17 01:18:33 +01:00
  • 6b3fb138bc ...again clemens 2018-01-15 11:25:55 +01:00
  • 772a96f28f set STATICROOT for production mode clemens 2018-01-15 11:20:30 +01:00
  • edbf9d0f0f fix volume clemens 2018-01-15 10:42:16 +01:00
  • 365ed3c04a Merge branch 'master' into app.wiai.de clemens 2018-01-15 10:31:28 +01:00
  • b87f6ac56b Fix image hack Michael Götz 2018-01-13 02:09:00 +01:00
  • fed22f53a1 Change file food names to food_ids Michael Götz 2018-01-12 23:55:15 +01:00
  • 0ce1b2edbc Fix shity bugs Michael Götz 2018-01-12 23:53:01 +01:00
  • f69561dd45 Merge branch 'develop_food' Michael Götz 2018-01-12 23:26:05 +01:00
  • a93859167a Update picture upload develop_food Michael Götz 2018-01-12 23:24:27 +01:00
  • bdc6d36ce4 Fix location choices bug Michael Götz 2018-01-12 23:13:54 +01:00
  • e683648d61 update sample.env clemens 2018-01-11 13:20:43 +01:00
  • 60f04cfa93 use postgres clemens 2018-01-11 13:13:53 +01:00
  • f35364d02c Update location handling Michael Götz 2018-01-11 11:52:15 +01:00
  • 1ca02a9a61 Merge branch 'master' into app.wiai.de clemens 2018-01-11 10:34:51 +01:00
  • bc0b742305 Fix weekly bug Michael Götz 2018-01-11 09:22:23 +01:00
  • 80250d9e6d Hopefully a utf8 fix Michael Götz 2018-01-09 12:52:53 +01:00
  • 0610bae18e Fix happy-hour url mapping Michael Götz 2018-01-08 18:57:32 +01:00
  • 6d1da0b427 Fix markusplatz markusstrasse bug develop_restapi Michael Götz 2018-01-08 18:45:09 +01:00
  • 0dd3f51668 Merge branch 'develop_restapi' Michael Götz 2018-01-05 03:52:06 +01:00
  • 7fdae11859 Implement image serializer, Update default pic Michael Götz 2018-01-05 03:48:27 +01:00
  • a89da403ed add food picture managament feature Michael Götz 2018-01-04 20:47:16 +01:00
  • a6c5fb1491 Merge master michigg 2017-12-21 12:44:49 +01:00
  • a4087d9345 Fuck db michigg 2017-12-21 12:32:41 +01:00
  • af512fd33a Merge branch 'master' of mg-server.ddns.net:BaStA/basta-server michigg 2017-12-14 15:19:48 +01:00
  • eb5337898e Hmm. Kp michigg 2017-12-14 15:19:42 +01:00
  • 7be7304b85 fix ALLOWED_HOST, Volume for db.sqlite clemens 2017-12-14 11:38:13 +01:00
  • 02c7fe4d3e add missing depencies in Dockerfile clemens 2017-12-14 11:15:30 +01:00
  • b2565b2dc2 move docker to port 80 master clemens 2017-12-14 10:50:49 +01:00
  • 517f067793 add docker files clemens 2017-12-07 13:06:18 +01:00
  • e6fc1ed465 Fix image carusel michigg 2017-12-05 03:24:57 +01:00
  • a5fe63f7f1 Add lightbox2 dist folder michigg 2017-12-05 03:15:21 +01:00
  • 336e48d969 Better food rating michigg 2017-12-05 01:41:57 +01:00
  • a1c5a7788b Change Date View in the weekly view michigg 2017-12-05 00:44:28 +01:00
  • 80375597f5 Remove bottom nav michigg 2017-12-05 00:32:43 +01:00
  • 3321fd676c Introduce tab in food view michigg 2017-12-05 00:13:47 +01:00
  • 09508c9c5a Fancy Pics michigg 2017-12-04 20:38:16 +01:00
  • 2becc0b257 Fix the fuck michigg 2017-12-04 11:51:27 +01:00
  • d1fc34b004 Fix userpicture bug, food_import bug michigg 2017-12-04 11:43:17 +01:00
  • f355b833fc Add default pic michigg 2017-12-04 05:57:04 +01:00
  • b253e9cd09 Fixed food import bug michigg 2017-12-04 05:17:46 +01:00
  • 6ce4f8e79b Removed Timedelta michigg 2017-12-04 04:49:26 +01:00
  • af692d405d Fuck Off michigg 2017-12-04 04:46:06 +01:00
  • 580fb79dba Unfinished api refractoring michigg 2017-11-30 12:37:14 +01:00
  • 6db2413da8 Extend food api (Rating, Price, ids) michigg 2017-11-23 15:57:51 +01:00
  • 07a3c256e9 Fix detail url michigg 2017-11-23 14:12:20 +01:00
  • 1489b413ee Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/basta/basta-server www-data 2017-11-23 13:45:29 +01:00
  • eed7ad98f1 Remove pycache michigg 2017-11-23 13:45:19 +01:00
  • 6dc7778ff4 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/basta/basta-server www-data 2017-11-16 16:09:02 +01:00
  • f7c83ac40c Allow all api access michigg 2017-11-16 16:02:01 +01:00
  • dbbc99132d add simple happy hour api michigg 2017-11-13 03:11:12 +01:00
  • 92f57d0953 started food api michigg 2017-11-13 02:52:17 +01:00