Commit graph

80 commits

Author SHA1 Message Date
Letícia Camara
3aa855ef70 Merge branch 'master' into mx 2018-11-14 21:50:31 -02:00
Letícia Camara
7b27e6ef92 Fix website duplication and show on map nowrap text 2018-11-14 21:50:02 -02:00
Letícia Camara
0841aabb14 Add /ambs and /merchants es translations 2018-11-13 22:14:54 -02:00
Letícia Camara
0d8d5811c8 Merge branch 'master' into mx 2018-11-13 22:14:10 -02:00
Letícia Camara
08f8b344d5 Field alignment search with title and table 2018-11-13 22:07:04 -02:00
Letícia Camara
c932afdeee Merge branch 'master' into mx 2018-11-13 18:37:32 -02:00
Letícia Camara
bc7467bfa0 Fix empty telegram crash 2018-11-13 18:11:59 -02:00
Letícia Camara
0eef532e0e Change default language to es 2018-11-12 01:07:36 -02:00
Letícia Camara
ad44177e7f Add phone, clicable website and telegram to merchants map pins 2018-11-12 01:03:05 -02:00
Letícia Camara
46242370b7 Solve conflicts 2018-11-11 23:21:45 -02:00
Letícia Camara
6a680ee1f1 Fix /ambs and /merchants mobile 2018-11-11 21:39:14 -02:00
Letícia Camara
bc088fd427 Telegram opening link 2018-11-11 18:20:49 -02:00
Letícia Camara
8e57fb30bf Add phone, clicable website and telegram to /merchants 2018-11-11 17:59:08 -02:00
Letícia Camara
4f82dbc33f Replace spanish strings for english 2018-11-09 16:53:27 -02:00
Letícia Camara
3c78f7ee77 Ajust the search and description from /ambs and /merchants 2018-11-07 12:49:14 -02:00
Letícia Camara
8a8e2ee6a2 Add merchants and ambs cluster logic 2018-11-05 19:02:50 -02:00
Letícia Camara
01b2388a5c Add customized cluster items for 10 possibles sizes 2018-11-05 15:32:39 -02:00
Letícia Camara
65a03c55e2 Merge branch 'master' into mx 2018-11-05 12:07:45 -02:00
Letícia Camara
6aee805673 Update google maps API key 2018-11-05 01:38:34 -02:00
Letícia Camara
4a2c8f76dd Add contact info at merchants table 2018-11-04 21:33:55 -02:00
Letícia Camara
5af3a3acde Move the search box up so that it is in line (to the left) of the paragraph of merchant text 2018-11-04 18:26:38 -02:00
Letícia Camara
8fbd72bb1a Move the search box up so that it is in line (to the left) of the paragraph of ambassador text 2018-11-04 17:42:22 -02:00
Letícia Camara
23318a59e8 Sort merchants by country and city on component load 2018-11-02 19:11:52 -03:00
Letícia Camara
b782cfcd84 Sort ambassador by country and city on component load 2018-11-02 18:25:50 -03:00
Letícia Camara
8fe0954587 Fixed the anchor in services and uppercase in slogan 2018-11-02 03:24:32 -03:00
Letícia Camara
98e03e8dab Fixed the anchor in services, uppercase in slogan and fixed the footer link 2018-11-02 02:29:40 -03:00
Letícia Camara
ba65b67aaa Location sort based on Country first and city 2018-11-01 14:05:53 -03:00
Letícia Camara
57a63fa711 Replace city and country by sortable location 2018-10-31 19:53:04 -03:00
Letícia Camara
3b4593540f Remove sort link on the Map column 2018-10-31 14:28:06 -03:00
Letícia Camara
b958da3bc4 Fix ambassadors and merchant sort undefined error 2018-10-30 21:17:51 -03:00
Letícia Camara
47b51ce53f Merge branch 'master' into mx 2018-10-30 18:42:26 -03:00
Letícia Camara
e2c8af605e Add correct backend url 2018-10-30 17:41:39 -03:00
Letícia Camara
44bbca4e94 Fix all ambassadors sort fields 2018-10-30 16:37:50 -03:00
Letícia Camara
a7b2d8fe5c Add ambassor URL sort 2018-10-30 13:53:44 -03:00
Letícia Camara
2300fa99ff Fix ambassador's telegram sort 2018-10-29 19:32:25 -03:00
Letícia Camara
f525d6ef40 Fix ambassador's nickname search 2018-10-29 16:10:08 -03:00
Letícia Camara
cda1052c53 Add telegram hyperlink at ambassador map pin 2018-10-29 14:02:41 -03:00
Letícia Camara
c5a2ea8b8f Add telegram hyperlink with correct link 2018-10-28 22:22:19 -03:00
Letícia Camara
05c2a43bee Fix image header blur 2018-10-25 19:24:58 -03:00
Letícia Camara
5decebd3aa Fix testimonies font 2018-10-25 17:12:49 -03:00
Letícia Camara
c6912c8dd5 Add all public info to ambassador map pin popup 2018-10-19 01:46:35 -03:00
Letícia Camara
be8e330d4c Add all public info to merchant map pin popup 2018-10-18 17:29:27 -03:00
Letícia Camara
4283544cb2 Fix map switches colors 2018-10-18 16:10:17 -03:00
Letícia Camara
06ff3e0ff9 Align Titles - logo 2018-10-18 16:03:24 -03:00
Letícia Camara
b758b1ead2 Align Titles 2018-10-18 00:26:34 -03:00
Letícia Camara
0fa3eda540 Images compress - header 2018-10-15 22:51:00 -03:00
Letícia Camara
4f84a4db67 Images compress - header 2018-10-15 22:50:02 -03:00
Letícia Camara
8814e9c95c Fix conflict 2018-10-15 20:33:43 -03:00
Letícia Camara
164b4461ab Images compress 2018-10-15 20:26:10 -03:00
Letícia Camara
9ed587f98b Merge branch 'master' into mx 2018-10-13 18:06:12 -03:00