Carlos Jimenez Ruiz
|
1c0d5dbd76
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-02 09:42:13 +02:00 |
 Joan Sanchez
|
33aec33cba
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-02 08:12:32 +02:00 |
|
Carlos Jimenez Ruiz
|
9fa3f17a9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-01 17:45:00 +02:00 |
|
Joan Sanchez
|
6a065091de
|
First version of multicheck selection
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-09-01 15:13:33 +02:00 |
|
Carlos Jimenez Ruiz
|
a555dea339
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
|
2020-09-01 10:51:54 +02:00 |
|
Joan Sanchez
|
baf9ec6e70
|
2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 08:32:30 +02:00 |
|
Carlos Jimenez Ruiz
|
3a82ef0e06
|
2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-26 16:33:47 +02:00 |
|
Carlos Jimenez Ruiz
|
dee3ab166a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-17 14:18:44 +02:00 |
|
Joan Sanchez
|
e2c742c893
|
#2383 - Changed model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-10 14:29:25 +02:00 |
|
Joan Sanchez
|
35c9cf7146
|
#2331 Refresh data on onFilter() when source is "state"
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-10 08:47:00 +02:00 |
|
Carlos Jimenez Ruiz
|
e974f638dd
|
2361 ticket sale multi check fix-ish +popover size
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-30 16:05:48 +02:00 |
|
Carlos Jimenez Ruiz
|
b926f8f8ad
|
core component to vnComponent working
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-24 17:46:06 +02:00 |
|
Carlos Jimenez Ruiz
|
9d8c64fb92
|
parts of core component to vnComponent working
|
2020-07-24 17:04:34 +02:00 |
|
Carlos Jimenez Ruiz
|
fbd020e600
|
front salix component to vnComponent working
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-24 14:55:01 +02:00 |
|
Carlos Jimenez Ruiz
|
4ca004f833
|
angular.mock.injet shorten to inject
|
2020-07-23 16:46:16 +02:00 |
|
Carlos Jimenez Ruiz
|
7d5dc776c1
|
replaced most of the translate.instant for $t
|
2020-07-23 16:07:08 +02:00 |
|
Carlos Jimenez Ruiz
|
59e43ea17f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-20 11:51:23 +02:00 |
|
Carlos Jimenez Ruiz
|
f2730dd51c
|
some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-20 11:31:47 +02:00 |
Joan Sánchez
|
01b32d2b89
|
Calendar changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-08 15:05:56 +02:00 |
|
Carlos Jimenez Ruiz
|
0ae7587698
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1788-remove_autoload_vnTable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 16:56:37 +02:00 |
|
Carlos Jimenez Ruiz
|
8794932949
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2295-add_quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 16:44:36 +02:00 |
|
Carlos Jimenez Ruiz
|
f2e1f00ae3
|
using csss variables plus a traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 16:43:45 +02:00 |
|
Carlos Jimenez Ruiz
|
0b8e749939
|
removed autoLoad from vnTable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 15:14:57 +02:00 |
|
Carlos Jimenez Ruiz
|
663b5fb9aa
|
descriptor can now have 4 quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 13:28:49 +02:00 |
|
Carlos Jimenez Ruiz
|
1839bb43d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1786-input_validation_Jest
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-03 12:13:51 +02:00 |
|
Carlos Jimenez Ruiz
|
018e17487e
|
imput validation is ok with Jest
|
2020-07-03 12:13:42 +02:00 |
|
Carlos Jimenez Ruiz
|
8b040a119f
|
id is now shown in black
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-02 15:20:11 +02:00 |
|
Joan Sanchez
|
c9d94ca814
|
Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-30 09:37:09 +02:00 |
|
Joan Sanchez
|
2c23f3417a
|
Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-29 11:43:53 +02:00 |
 Juan Ferrer
|
8e51104e1b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-17 13:31:54 +02:00 |
|
Juan Ferrer
|
8ece348b30
|
Language bug fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-17 13:09:40 +02:00 |
|
Joan Sanchez
|
ed83fd5f73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption
|
2020-06-15 09:00:24 +02:00 |
 Bernat Exposito
|
e335775cdb
|
Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-15 06:24:23 +00:00 |
|
Joan Sanchez
|
25b1c6bd8f
|
2239 - Added services
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 14:28:29 +02:00 |
|
Joan Sanchez
|
48034b234f
|
2325 - Search address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 10:53:33 +02:00 |
|
Joan Sanchez
|
5fbcb5c439
|
2290 - Client consumption
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-10 13:35:41 +02:00 |
|
Joan Sanchez
|
ab776fc652
|
Fixed remove filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:43:14 +02:00 |
|
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
|
Joan Sanchez
|
6883303bb1
|
Added scss file
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 13:15:48 +02:00 |
|
Joan Sanchez
|
ab1e8fb622
|
2176 First working version
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 12:14:27 +02:00 |
|
Joan Sanchez
|
181f2f0148
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 08:19:18 +02:00 |
|
Joan Sanchez
|
048f01305d
|
2220 - Added clearDisabled param
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 13:14:14 +02:00 |
|
Joan Sanchez
|
16d7186829
|
Fixed initial filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 14:42:58 +02:00 |
|
Joan Sanchez
|
90ae1562dd
|
Added filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-29 11:10:58 +02:00 |
|
Joan Sanchez
|
0fe78a2b8f
|
2176 - Added contextmenu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-28 08:07:26 +02:00 |
|
Joan Sanchez
|
aa95a9f984
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 12:33:01 +02:00 |
|
Joan Sanchez
|
03c9b7ffa6
|
Removed fetchSelection()
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 12:15:41 +02:00 |
|
Joan Sanchez
|
d082f5d6c2
|
2225 Prevent location override
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 11:14:34 +02:00 |
|
Carlos Jimenez Ruiz
|
4df8d78a4b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1791_dreprecate_boot-salixjs
|
2020-05-21 09:25:19 +02:00 |
|
Carlos Jimenez Ruiz
|
44cd2f743f
|
updated the modelInfo route for the tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 09:23:44 +02:00 |
|
Carlos Jimenez Ruiz
|
d299f455d6
|
boot/salix.js deprecated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-21 09:06:02 +02:00 |
 Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-20 08:40:02 +00:00 |
Bernat Exposito Domenech
|
d729efb761
|
searchbar fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 09:03:47 +02:00 |
|
Bernat Exposito Domenech
|
4133021e5c
|
fix translate on plural
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 08:52:20 +02:00 |
|
Juan Ferrer
|
c998097ba1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 12:30:00 +02:00 |
 Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
|
Juan Ferrer
|
e7cf060e12
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:51:50 +02:00 |
|
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:27:22 +02:00 |
|
Juan Ferrer
|
d7f2e686b1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 09:28:50 +02:00 |
|
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
|
Joan Sanchez
|
53b55468fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 11:45:43 +02:00 |
|
Carlos Jimenez Ruiz
|
b7b02566d1
|
fixed tooltip unit test for Jest
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 10:05:54 +02:00 |
|
Joan Sanchez
|
67fc332b46
|
1833 Currency filter error
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-15 17:00:55 +02:00 |
|
Carlos Jimenez Ruiz
|
c296c454d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test
|
2020-05-15 16:10:38 +02:00 |
|
Joan Sanchez
|
94a219760c
|
2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-13 15:04:57 +02:00 |
|
Carlos Jimenez Ruiz
|
3946155e24
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test
|
2020-05-13 09:21:09 +02:00 |
|
Juan Ferrer
|
07cbac7fcd
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 19:56:39 +02:00 |
|
Juan Ferrer
|
7a1bb7e68d
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-08 14:01:49 +02:00 |
|
Juan Ferrer
|
b14d2f9455
|
Small fixes in vnOrderCatalog and vnZoneEvents
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 13:23:06 +02:00 |
|
Juan Ferrer
|
6c14743017
|
Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 14:38:09 +02:00 |
|
Juan Ferrer
|
6a8e1bf6b5
|
#1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-30 12:48:52 +02:00 |
|
Javi Gallego
|
7e895749eb
|
sin use strict
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-30 08:18:40 +02:00 |
|
Javi Gallego
|
7da7e6cfaf
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-30 08:13:25 +02:00 |
|
Javi Gallego
|
ceb3d1f4cf
|
all filters tested
|
2020-04-30 07:20:43 +02:00 |
|
Juan Ferrer
|
b536c8291a
|
#1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-28 14:26:02 +02:00 |
|
Juan Ferrer
|
5826099601
|
#1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-25 11:50:04 +02:00 |
|
Juan Ferrer
|
a1a460d049
|
gulp-jamine@4.0.0, waitForSnackbar()
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 11:24:40 +02:00 |
|
Juan Ferrer
|
4336a303c0
|
Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate
|
2020-04-07 13:03:57 +02:00 |
|
Javi Gallego
|
d835dd60ed
|
2219 Añadir menu wikipedia
|
2020-04-06 12:40:21 +02:00 |
|
Juan Ferrer
|
81d50c92ae
|
SCSS em to px: Fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-02 17:06:07 +02:00 |
|
Juan Ferrer
|
d75b975b14
|
SCSS em to px: last refactor fixes
|
2020-04-02 16:29:13 +02:00 |
|
Juan Ferrer
|
2249f68d6e
|
SCSS px to em: rem for font-size
|
2020-04-02 15:11:42 +02:00 |
|
Juan Ferrer
|
559cc5eb8c
|
SCSS em to px: Second step
|
2020-04-02 14:52:02 +02:00 |
|
Juan Ferrer
|
734c86c5f5
|
SCSS px to em - First step
|
2020-04-02 14:20:57 +02:00 |
|
Juan Ferrer
|
c43727aef9
|
Global style fixes px/em
|
2020-04-02 14:08:38 +02:00 |
|
Juan Ferrer
|
bf68d15264
|
E2E expeditions fixes, scss px/em fixes
|
2020-04-02 11:39:39 +02:00 |
|
Juan Ferrer
|
eb586c510e
|
E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-04-01 16:05:43 +02:00 |
|
Carlos Jimenez Ruiz
|
a7c3a7b7b5
|
tooltip test enabled but not yet fixed
|
2020-03-31 09:51:10 +02:00 |
|
Juan Ferrer
|
dfb9d32c2a
|
Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-03-30 17:30:03 +02:00 |
|
Javi Gallego
|
0a8272a730
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 17:52:41 +01:00 |
|
Javi Gallego
|
d53cedd5d4
|
preparado para PR
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 17:41:40 +01:00 |
|
Juan Ferrer
|
0bd09492d1
|
#2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-25 20:44:59 +01:00 |
|
Juan Ferrer
|
a52fcb587a
|
drop-down e2e fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-24 14:10:07 +01:00 |
|
Juan Ferrer
|
84bf240e71
|
All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-23 23:57:11 +01:00 |
|
Juan Ferrer
|
6dcee3516d
|
ticket e2e fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-23 10:40:09 +01:00 |
|
Juan Ferrer
|
acac77ad76
|
Test fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 15:59:03 +01:00 |
|
Juan Ferrer
|
e5dee21926
|
Pull request fixes
|
2020-03-18 13:54:05 +01:00 |
|
Juan Ferrer
|
b4a5a88943
|
E2E fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-17 14:01:25 +01:00 |
|
Juan Ferrer
|
48980c7d38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult
|
2020-03-17 13:34:54 +01:00 |
|
Juan Ferrer
|
176e38c144
|
Merge fixes
|
2020-03-16 18:54:22 +01:00 |