Commit Graph

10269 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 17b7ffeec3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-20 16:04:13 +01:00
Carlos Jimenez Ruiz 4fa4119424 Merge pull request '2564-item_priceFixed + e2e' (#513) from 2564-item_priceFixed into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #513
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-01-20 14:34:04 +00:00
Joan Sanchez c8ecdfe380 Worker photo max width and height
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 15:00:44 +01:00
Carlos Jimenez Ruiz 2f5eaf7318 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:51:37 +01:00
Jorge Padawan e205ebba72 Added main spec and fixed line on search-panel spec
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz 01191b3f0f excluded faling tests for future fixing 2021-01-20 14:43:20 +01:00
Carlos Jimenez Ruiz fcf60ac297 excluded failing test for future fixing 2021-01-20 14:40:32 +01:00
Carlos Jimenez Ruiz fe04f00c28 fixed unit test for upsertFixedPrice 2021-01-20 14:39:23 +01:00
Jorge Padawan d8c4fa1e22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:37:29 +01:00
Joan Sanchez 6451d9d511 Merge branch 'dev' into 2677-rating_component
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:03:33 +00:00
Joan Sanchez 5df35ea8e9 Removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 14:01:57 +01:00
Joan Sanchez 508ea27526 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:58:09 +01:00
Joan Sanchez f125f7c80d Changed weekly translation
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:57:48 +01:00
Javi Gallego a6dfdc971a receipt_beforInsert
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:54:55 +01:00
Javi Gallego 4cdbb85e30 primer comit
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:53:49 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:51:30 +01:00
Carlos Jimenez Ruiz f7cca6638a selectors refactor
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:27:03 +01:00
Jorge Padawan 0183f956d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:23:40 +01:00
Jorge Padawan 91979f5d69 Add scopeDays to search bar on route 2021-01-20 13:19:28 +01:00
Bernat Exposito 0f17fca0a1 pr order by changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 11:42:45 +01:00
Bernat Exposito 7c2f32db76 Merge branch '2589-entry_index' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 11:31:20 +01:00
Bernat Exposito c1202789dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-01-20 11:31:06 +01:00
Bernat Exposito a3d4f674c6 order index changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 11:28:15 +01:00
Carlos Jimenez Ruiz f07c91fdc1 translation amends
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 09:28:07 +01:00
Carlos Jimenez Ruiz ef3b48005e sql changes now in correct version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 09:23:58 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-20 09:17:55 +01:00
Joan Sanchez b04eadbe79 Merge branch 'dev' into 2589-entry_index
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 07:29:46 +00:00
Joan Sanchez a67c8e4fbd Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:22:23 +01:00
Joan Sanchez 94b8fa7c4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-20 08:22:05 +01:00
Joan Sanchez 24982ba030 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:21:45 +01:00
Joan Sanchez ffb76e6cb5 Added new db version
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 08:12:40 +01:00
Joan Sanchez 3a2db713e0 Removed unused $httpBackend
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 07:38:09 +01:00
Carlos Jimenez Ruiz 7ec1e4272a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-19 20:56:40 +01:00
Carlos Jimenez Ruiz f946e63a86 e2e path for item fixed price 2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz 9e97300516 Merge pull request '1823 - Added independent order object from card' (#516) from 1823-catalog_no_refresh into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #516
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-19 14:21:12 +00:00
Carlos Jimenez Ruiz fc0f9730da Merge branch 'dev' into 1823-catalog_no_refresh
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:13:38 +00:00
Carlos Jimenez Ruiz 2a6d740056 Merge pull request '2708 - Extra community changes' (#503) from 2708-travel_extracommunity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #503
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-01-19 14:13:10 +00:00
Carlos Jimenez Ruiz b28b9be3d8 Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:51:58 +00:00
Joan Sanchez 3625ea2c36 Updated delivery note with botanical field
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:43:40 +01:00
Joan Sanchez bbfb230427 Removed clog
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:30:06 +01:00
Joan Sanchez 9935f7f4ee Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:27:58 +01:00
Joan Sanchez 6d35a4a160 1823 - Added independent order object from card
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:57:04 +01:00
Bernat Exposito e9f408d5ba delete comments
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:44:14 +01:00
Carlos Jimenez Ruiz 4f7c2f3afd added placeholder and fixed css 2021-01-19 13:30:07 +01:00
Joan Sanchez dfbf114161 Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-19 12:10:06 +00:00
Joan Sanchez 8c8891f8e3 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-19 13:06:10 +01:00
Bernat Exposito 426249f9bf entry index changes
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 12:50:11 +01:00
Javi Gallego e47e5b9ec4 merged carpetas de cambios
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:32:47 +01:00
Joan Sanchez 5c4dd027d3 Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:25:05 +01:00
Carlos Jimenez Ruiz e859a1b837 removed incorrect icon
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:14:43 +01:00