phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 0c8959f4e7 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-22 17:11:22 +0300
  • d1c9e649b7 Remove metadatacontent evgeniy-st 2019-10-22 17:05:54 +0300
  • 7b3a379b3f Merge branch 'feature/cities_by_country' into 'develop' e.stoyushko 2019-10-22 13:00:22 +0000
  • 939e4a26a0 Feature/cities by country Semyon Yekhmenin 2019-10-22 13:00:22 +0000
  • 45a3cd4b2b Merge branch 'develop' into feature/product evgeniy-st 2019-10-22 15:58:51 +0300
  • 071b634659 fixed EstablishmentFilter Anatoly 2019-10-22 15:58:00 +0300
  • e1e3799c5f Update .gitlab-ci.yml v.gladkikh 2019-10-22 12:49:47 +0000
  • 4c9ea2e0e7 change field properties for Collection model Anatoly 2019-10-22 15:45:27 +0300
  • e70efe3609 Update .gitlab-ci.yml v.gladkikh 2019-10-22 12:45:53 +0000
  • ba58b74fdf Update .gitlab-ci.yml v.gladkikh 2019-10-22 12:44:48 +0000
  • 307abddbbf 1 Виктор Гладких 2019-10-22 15:43:26 +0300
  • 580081f76d 1 Виктор Гладких 2019-10-22 15:41:10 +0300
  • 386e7d1bf8 First CI Виктор Гладких 2019-10-22 15:39:51 +0300
  • 5043462095 prototype michail 2019-10-22 17:11:45 +0500
  • 6c195bc185 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-21 20:26:31 +0300
  • 4ceb0e4d86 fix establishment migration evgeniy-st 2019-10-21 20:22:47 +0300
  • 18a2517fde Merge branch 'feature/GM-176_standard_user' into 'develop' d.kuzmenko 2019-10-21 14:50:47 +0000
  • 42e822e5c1 Merge branch 'feature/news_model_update' into 'develop' e.stoyushko 2019-10-21 14:45:34 +0000
  • afc2127646 Updated news model with agenda and banner Semyon Yekhmenin 2019-10-21 14:45:34 +0000
  • 786ee03d8e Fix littlewolf 2019-10-21 17:24:30 +0300
  • 863762bdf2 Fix state littlewolf 2019-10-21 17:23:50 +0300
  • 21f10d06f2 Fix state littlewolf 2019-10-21 17:22:28 +0300
  • 55263e4059 remove merge migration evgeniy-st 2019-10-21 16:51:01 +0300
  • 9c80811020 Merge branch 'develop' into feature/gm-148 evgeniy-st 2019-10-21 16:50:18 +0300
  • 19caf9faa6 Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148 evgeniy-st 2019-10-21 16:48:39 +0300
  • e67516c324 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop evgeniy-st 2019-10-21 16:47:58 +0300
  • 94502cfc73 added priority field to tag model (f7facf826d) evgeniy-st 2019-10-21 16:47:01 +0300
  • f96a1d4aa2 Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field." evgeniy-st 2019-10-21 16:42:08 +0300
  • 23b46e69ed Fix test location Виктор Гладких 2019-10-21 16:28:32 +0300
  • d1d092e49d Fix news tests Виктор Гладких 2019-10-21 16:21:14 +0300
  • 87708df084 Fix test establishment Виктор Гладких 2019-10-21 16:11:28 +0300
  • adbc22f1f6 Fix comment test Виктор Гладких 2019-10-21 16:03:19 +0300
  • 196d335213 Fix Виктор Гладких 2019-10-21 15:47:06 +0300
  • f65af6f7cf Merge branch 'feature/GM-176_standard_user' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/GM-176_standard_user Виктор Гладких 2019-10-21 15:44:54 +0300
  • 4f02fef456 Fix migrate Виктор Гладких 2019-10-21 15:44:20 +0300
  • 4d3ecb65f2 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects michail 2019-10-21 17:32:02 +0500
  • e7107cfd04 fixes of news michail 2019-10-21 17:31:44 +0500
  • 1ed48a43eb Fix url Виктор Гладких 2019-10-21 15:31:19 +0300
  • ee93cf9ff6 Fix migrate Виктор Гладких 2019-10-21 15:15:19 +0300
  • 264e7bcb2a Fix conflict Виктор Гладких 2019-10-21 14:43:14 +0300
  • cc5249674d merge migrations Kuroshini 2019-10-21 14:39:23 +0300
  • 019c22a0c8 Fix test Виктор Гладких 2019-10-21 14:39:04 +0300
  • 3f85aa84cc Remove tmp code littlewolf 2019-10-21 14:19:01 +0300
  • 71ec593ecf News email new layout Kuroshini 2019-10-21 14:09:08 +0300
  • 6dd66275ef Fix trash Виктор Гладких 2019-10-21 12:18:57 +0300
  • 3720ac2b8e Fix collection test Виктор Гладких 2019-10-21 12:17:12 +0300
  • f338906736 Fix location tests Виктор Гладких 2019-10-21 11:44:47 +0300
  • e2cbecf9a9 Merge branch 'feature/error_translations_fix' into 'develop' d.kuzmenko 2019-10-21 08:10:32 +0000
  • 1332a8f65a Login validation error message fix Semyon Yekhmenin 2019-10-21 08:10:32 +0000
  • c8b3f922e9 Fix location tests Виктор Гладких 2019-10-21 11:08:30 +0300
  • 2dbe65a169 Merge branch 'feature/gm-192' into feature/gm-148 evgeniy-st 2019-10-21 10:31:06 +0300
  • a9f995adbb Merge branch 'feature/gm-192' into develop evgeniy-st 2019-10-21 10:30:40 +0300
  • 1cd586662a fix tagcategory binding serializer evgeniy-st 2019-10-21 10:12:30 +0300
  • 7ebd338331 Tmp template fix littlewolf 2019-10-21 09:59:59 +0300
  • c6750400ba fix IntegerField to ForeignKey michail 2019-10-21 11:16:11 +0500
  • ec55f7915f Merge branch 'feature/migrate-city-objects' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/migrate-city-objects michail 2019-10-21 11:08:05 +0500
  • 019a10db52 commit michail 2019-10-21 11:07:54 +0500
  • 0a24b80917 Add title method littlewolf 2019-10-20 19:08:14 +0300
  • 8965cf0460 Add news serializer littlewolf 2019-10-20 17:59:18 +0300
  • f7facf826d Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field. Semyon 2019-10-18 18:37:24 +0300
  • 21e3f76f5a Backoffice Tag&TagCategory evgeniy-st 2019-10-18 18:02:24 +0300
  • 7be7315cef added filters and endpoint to get winery list Anatoly 2019-10-18 18:00:57 +0300
  • 5772558c4b Fix Виктор Гладких 2019-10-18 16:04:21 +0300
  • 7a4005ec21 Merge branch 'develop' into feature/GM-176_standard_user Виктор Гладких 2019-10-18 14:54:37 +0300
  • c44f8c39c1 Fix tests news Виктор Гладких 2019-10-18 13:05:42 +0300
  • 2e2ed19118 Fix establishment tests Виктор Гладких 2019-10-18 12:14:10 +0300
  • 3bc9dd7347 Open now filter (typo fix) Kuroshini 2019-10-18 02:56:49 +0300
  • b77c654c6c Open now filter Kuroshini 2019-10-18 02:38:59 +0300
  • 4b5b34de20 add preview image url (fix typo) Kuroshini 2019-10-17 23:28:13 +0300
  • 5f2501c712 add preview image url Kuroshini 2019-10-17 23:25:39 +0300
  • cce0913245 change AWS_S3_CUSTOM_DOMAIN Anatoly 2019-10-17 18:37:48 +0300
  • 1cbfb12594 Merge remote-tracking branch 'origin/develop' into feature/gm-148 evgeniy-st 2019-10-17 16:58:30 +0300
  • a553e459a1 Merge branch 'feature/mobile_features' into 'develop' e.stoyushko 2019-10-17 13:29:29 +0000
  • 1ff571b767 Feature/mobile features Semyon Yekhmenin 2019-10-17 13:29:29 +0000
  • 64ac59ee99 Add permission to view ReviewRUDView Виктор Гладких 2019-10-17 16:20:25 +0300
  • c012f969af Add RestaurantReviewer role Виктор Гладких 2019-10-17 16:17:17 +0300
  • d6ffbf5332 Merge branch 'develop' into feature/GM-176_standard_user Виктор Гладких 2019-10-17 15:27:49 +0300
  • 5a058c14f4 Add back for review Виктор Гладких 2019-10-17 15:26:26 +0300
  • 9661de4810 Establishment types evgeniy-st 2019-10-17 15:17:29 +0300
  • d2e34e5d49 Timetable search results Kuroshini 2019-10-17 15:10:26 +0300
  • c80b53a0fc reviewer manager Виктор Гладких 2019-10-17 15:04:08 +0300
  • 1998e3dc57 Change establishment schedule ES fields type Kuroshini 2019-10-17 14:59:35 +0300
  • 2c5c067b53 try to remove weekday_display Kuroshini 2019-10-17 14:56:31 +0300
  • 97fc8dce15 add schedule to search results Kuroshini 2019-10-17 14:45:33 +0300
  • c59811e037 Revert "Revert "add schedule to search results"" Kuroshini 2019-10-17 14:34:49 +0300
  • 19b3502f58 revert auth backends evgeniy-st 2019-10-17 14:34:31 +0300
  • acea297c94 Revert "add schedule to search results" Kuroshini 2019-10-17 14:33:20 +0300
  • c8c66e7d1b add schedule to search results Kuroshini 2019-10-17 14:32:01 +0300
  • 8a363498f5 change broker url Anatoly 2019-10-17 14:28:39 +0300
  • 79b4b59478 enabling celery for development and stage settings Anatoly 2019-10-17 13:49:29 +0300
  • 0c2b657244 small fix Anatoly 2019-10-17 13:47:59 +0300
  • 26ff9963d8 Merge branch 'develop' into feature/gm-148 Anatoly 2019-10-17 13:43:24 +0300
  • 8066d5607b comment all rabbitmq dependencies added redis to docker compose file Anatoly 2019-10-17 13:41:40 +0300
  • e2c27bd2e1 switched broker storage from rabbtimq to redis Anatoly 2019-10-17 13:40:52 +0300
  • 6a85e52abc Rename variable Kuroshini 2019-10-17 12:30:40 +0300
  • 094aa35e66 Merge branch 'develop' into feature/GM-176_standard_user Виктор Гладких 2019-10-17 10:25:50 +0300
  • 6926fc350f Merge branch 'feature/location_by_ip' into 'develop' d.kuzmenko 2019-10-17 07:03:48 +0000
  • 5176a455c1 Added method for getting coordinates and city by ip Semyon Yekhmenin 2019-10-17 07:03:48 +0000
  • 40f1cc1e22 Add lookup for categories Kuroshini 2019-10-16 20:56:56 +0300
  • 9fc4a8703c Search establishment by working time (added lookup) Kuroshini 2019-10-16 19:13:33 +0300