Commit Graph

981 Commits

Author SHA1 Message Date
Виктор Гладких
9383c806b0 Fix 2019-10-23 10:45:29 +03:00
Виктор Гладких
1887806fec Fix commit 2019-10-23 10:40:59 +03:00
Виктор Гладких
778162922e Test runner 2019-10-23 10:39:10 +03:00
Kuroshini
4a0a305e2c tag category indexing name 2019-10-22 18:45:31 +03:00
Anatoly
3d68f1ba29 added imgae_url field to model Award (gm-183) 2019-10-22 18:20:34 +03:00
evgeniy-st
1b9df7c713 Merge branch 'develop' into feature/product 2019-10-22 17:12:59 +03:00
evgeniy-st
0c8959f4e7 Merge branch 'develop' into feature/gm-148 2019-10-22 17:11:22 +03:00
evgeniy-st
d1c9e649b7 Remove metadatacontent 2019-10-22 17:05:54 +03:00
e.stoyushko
7b3a379b3f Merge branch 'feature/cities_by_country' into 'develop'
Feature/cities by country

See merge request gm/gm-backend!62
2019-10-22 13:00:22 +00:00
Semyon Yekhmenin
939e4a26a0 Feature/cities by country 2019-10-22 13:00:22 +00:00
evgeniy-st
45a3cd4b2b Merge branch 'develop' into feature/product 2019-10-22 15:58:51 +03:00
Anatoly
071b634659 fixed EstablishmentFilter 2019-10-22 15:58:00 +03:00
v.gladkikh
e1e3799c5f Update .gitlab-ci.yml 2019-10-22 12:49:47 +00:00
Anatoly
4c9ea2e0e7 change field properties for Collection model 2019-10-22 15:45:58 +03:00
v.gladkikh
e70efe3609 Update .gitlab-ci.yml 2019-10-22 12:45:53 +00:00
v.gladkikh
ba58b74fdf Update .gitlab-ci.yml 2019-10-22 12:44:48 +00:00
Виктор Гладких
307abddbbf 1 2019-10-22 15:43:26 +03:00
Виктор Гладких
580081f76d 1 2019-10-22 15:41:10 +03:00
Виктор Гладких
386e7d1bf8 First CI 2019-10-22 15:39:51 +03:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
evgeniy-st
4ceb0e4d86 fix establishment migration 2019-10-21 20:22:47 +03:00
d.kuzmenko
18a2517fde Merge branch 'feature/GM-176_standard_user' into 'develop'
Feature/gm 176 standard user

See merge request gm/gm-backend!54
2019-10-21 14:50:47 +00:00
e.stoyushko
42e822e5c1 Merge branch 'feature/news_model_update' into 'develop'
Updated news model with agenda and banner

See merge request gm/gm-backend!61
2019-10-21 14:45:34 +00:00
Semyon Yekhmenin
afc2127646 Updated news model with agenda and banner 2019-10-21 14:45:34 +00:00
evgeniy-st
55263e4059 remove merge migration 2019-10-21 16:51:01 +03:00
evgeniy-st
9c80811020 Merge branch 'develop' into feature/gm-148 2019-10-21 16:50:18 +03:00
evgeniy-st
19caf9faa6 Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148 2019-10-21 16:48:39 +03:00
evgeniy-st
e67516c324 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-10-21 16:47:58 +03:00
evgeniy-st
94502cfc73 added priority field to tag model (f7facf826d) 2019-10-21 16:47:01 +03:00
evgeniy-st
f96a1d4aa2 Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field."
This reverts commit f7facf826d.
2019-10-21 16:42:08 +03:00
Виктор Гладких
23b46e69ed Fix test location 2019-10-21 16:28:32 +03:00
Виктор Гладких
d1d092e49d Fix news tests 2019-10-21 16:21:14 +03:00
Виктор Гладких
87708df084 Fix test establishment 2019-10-21 16:11:28 +03:00
Виктор Гладких
adbc22f1f6 Fix comment test 2019-10-21 16:03:19 +03:00
Виктор Гладких
196d335213 Fix 2019-10-21 15:47:06 +03:00
Виктор Гладких
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 +03:00
Виктор Гладких
4f02fef456 Fix migrate 2019-10-21 15:44:20 +03:00
Виктор Гладких
1ed48a43eb Fix url 2019-10-21 15:31:19 +03:00
Виктор Гладких
ee93cf9ff6 Fix migrate 2019-10-21 15:15:19 +03:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Kuroshini
cc5249674d merge migrations 2019-10-21 14:39:23 +03:00
Виктор Гладких
019c22a0c8 Fix test 2019-10-21 14:39:04 +03:00
Kuroshini
71ec593ecf News email new layout 2019-10-21 14:09:20 +03:00
Виктор Гладких
6dd66275ef Fix trash 2019-10-21 12:18:57 +03:00
Виктор Гладких
3720ac2b8e Fix collection test 2019-10-21 12:17:12 +03:00
Виктор Гладких
f338906736 Fix location tests 2019-10-21 11:44:47 +03:00
d.kuzmenko
e2cbecf9a9 Merge branch 'feature/error_translations_fix' into 'develop'
Login validation error message fix

See merge request gm/gm-backend!60
2019-10-21 08:10:32 +00:00
Semyon Yekhmenin
1332a8f65a Login validation error message fix 2019-10-21 08:10:32 +00:00
Виктор Гладких
c8b3f922e9 Fix location tests 2019-10-21 11:08:30 +03:00
evgeniy-st
2dbe65a169 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-21 10:31:06 +03:00