Commit Graph

659 Commits

Author SHA1 Message Date
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +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 f2bff056e9 Changes 2020-08-10 10:36:37 +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
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 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 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