verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
6,365 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

471 Commits

Author SHA1 Message Date
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Juan Ferrer daeb4bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 11:15:25 +02:00
Juan Ferrer 0bd852604a Refactor: vnCheck, vnRadio, vnTreeview, vnNumber 2019-10-01 11:15:15 +02:00
Joan Sanchez 26be791cf0 fixed styles
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-10-01 10:35:27 +02:00
Juan Ferrer eba854f0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-30 20:46:34 +02:00
Juan Ferrer 679c6af0df #1297 Angular material removed from project 2019-09-30 20:46:22 +02:00
Joan Sanchez 6d54e7a89d Claim dms upload file with drag & drop #1731
gitea/salix/dev There was a failure building this commit Details
2019-09-30 14:57:54 +02:00
Javi Gallego 0573fec950 merge
gitea/salix/dev This commit has test failures Details
2019-09-30 14:37:51 +02:00
Javi Gallego 1c2759eb0f # 496 sustituir interpolate por plantillas angular 2019-09-30 14:32:42 +02:00
Juan Ferrer a177ad8e26 Fixes 2019-09-30 13:02:11 +02:00
Juan Ferrer 55133ded68 Fixes 2019-09-30 11:31:10 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Juan Ferrer 83c6d15eb1 Calendar fixes
gitea/salix/dev This commit looks good Details
2019-09-26 15:39:08 +02:00
Juan Ferrer dbd70da866 Merge
gitea/salix/dev This commit looks good Details
2019-09-26 13:36:22 +02:00
Joan Sanchez ca4009088d Descuadre de meses componente calendar #1733
gitea/salix/dev This commit looks good Details
2019-09-26 10:43:06 +02:00
Juan Ferrer c0f39ba87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 10:09:07 +02:00
Carlos Jimenez Ruiz 156c9ec3ab #1716 ticket.summary añadir link a la Ruta
gitea/salix/dev This commit looks good Details
2019-09-26 09:05:54 +02:00
Juan Ferrer 91e4e62a1c Merge branch 'test' into dev 2019-09-26 08:44:00 +02:00
Juan Ferrer 2a0cc1dc8b Style/i18n fixes 2019-09-25 23:09:10 +02:00
Juan Ferrer 91b5ad5a3e Merge 2019-09-25 20:11:14 +02:00
Juan Ferrer 98cc3ce00e Agency events, delivery days viewer 2019-09-25 20:06:42 +02:00
Carlos Jimenez Ruiz d1acd60d5a added a precise selector #1680
gitea/salix/dev This commit looks good Details
2019-09-24 13:22:01 +02:00
Carlos Jimenez Ruiz 25165792c8 #1680 left-menu descriptor scrollbar overlap 2019-09-24 09:29:57 +02:00
Joan Sanchez 7f33f4c56e fixed salixfront deletedTicket icon
gitea/salix/dev This commit looks good Details
2019-09-24 07:25:22 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690
gitea/salix/dev This commit looks good Details
2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz 695ff14b60 removed the tests index used by karma (deprecated)
gitea/salix/dev This commit looks good Details
2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz 0f04aed2fe #1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit Details
2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz b0e5b46245 #969 componente vnSearchBar front test
gitea/salix/dev There was a failure building this commit Details
2019-09-20 09:35:12 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez 248dff2747 cherry-pick
gitea/salix/master This commit looks good Details
2019-09-12 14:18:47 +02:00
Joan Sanchez f0253fd1ce Increased max file size up to 250MB
gitea/salix/dev This commit looks good Details
2019-09-12 14:16:09 +02:00
Joan Sanchez f6bd915ae6 Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good Details
2019-09-12 11:47:56 +02:00
Joan Sanchez ac26d224dd updated fonts & added "Fruit" item category #1688
gitea/salix/master Something is wrong with the build of this commit Details
2019-09-12 07:21:43 +02:00
Joan Sanchez 28ca32175e updated fonts & added "Fruit" item category #1688
gitea/salix/dev This commit looks good Details
2019-09-12 07:20:48 +02:00
Joan Sanchez 1f5a75b285 fixed karma unit tests
gitea/salix/dev This commit looks good Details
2019-09-09 10:57:10 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
2019-09-09 09:05:13 +02:00
Joan Sanchez 178dc6f2e8 Minor changes
gitea/salix/dev This commit looks good Details
2019-09-06 08:07:46 +02:00
Joan Sanchez 176750046a Scroll component #643
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Joan Sanchez 693c204e21 Calendar last day selection fixed #1465 2019-09-04 08:42:01 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good Details
2019-09-03 14:42:52 +02:00
Bernat b656db3a84 #1645 refactor search panel
gitea/salix/dev This commit looks good Details
2019-08-29 08:32:46 +02:00
Carlos Jimenez Ruiz c498216f0b #1647 ticket.menu la barra de desplazamiento
gitea/salix/dev This commit looks good Details
2019-08-23 10:17:41 +02:00
Bernat c58d94ccd8 fix getCurrentUserName front test
gitea/salix/dev This commit looks good Details
2019-08-19 08:28:46 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit Details
2019-08-19 07:56:20 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Joan Sanchez 2ff374e7ba postcode autocompletion fixes
gitea/salix/master This commit looks good Details
2019-08-02 08:28:44 +02:00
Joan Sanchez 2c71a983e3 postcode autocompletion fixes
gitea/salix/dev This commit looks good Details
2019-08-02 08:27:55 +02:00
Joan Sanchez e3c4536183 timeControl calendar fixed #1623
gitea/salix/master This commit looks good Details
2019-08-01 10:29:26 +02:00
Joan Sanchez 31b5f689df timeControl calendar fixed #1623
gitea/salix/dev This commit looks good Details
2019-08-01 09:58:59 +02:00
Joan Sanchez 77d8ac82a5 contabilize worker.calenday holidays, updated styles
gitea/salix/test This commit looks good Details
2019-07-31 09:51:08 +02:00
Joan Sanchez eccf381e56 contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures Details
2019-07-31 09:50:47 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Joan Sanchez 51734db404 ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit Details
2019-07-17 15:01:38 +02:00
Joan Sanchez 588250b1c1 dms update files
gitea/salix/dev This commit looks good Details
2019-07-15 11:40:11 +02:00
Joan Sanchez 9d0b88cd57 nginx
gitea/salix/master This commit looks good Details
2019-07-11 17:22:42 +02:00
Joan Sanchez 597e271789 revert
gitea/salix/master This commit looks good Details
2019-07-11 17:15:28 +02:00
Joan Sanchez 57a0a4113a increased nginx file size limit
gitea/salix/master This commit looks good Details
2019-07-11 17:07:25 +02:00
Joan Sanchez b29dd291ab removed console log
gitea/salix/dev This commit looks good Details
2019-07-08 14:17:12 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Joan Sanchez 507bc8c2ce updated fonts & calendar acls
gitea/salix/dev This commit looks good Details
2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz a7c5a9e598 #1566 ticket.sales state autocomplete 2019-06-27 09:44:19 +02:00
Joan Sanchez 8ff61a5d3a added zone prices, radio-group and calendar refactor #1320
gitea/salix/dev This commit looks good Details
2019-06-26 13:35:38 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good Details
2019-06-25 11:17:58 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533
gitea/salix/dev There was a failure building this commit Details
2019-06-20 13:50:58 +02:00
Joan Sanchez 471da18a6c optional bank entity code #1416
gitea/salix/dev There was a failure building this commit Details
2019-06-17 08:14:48 +02:00
Joan Sanchez 0d3efd2549 fixed table "No results" message #1535
gitea/salix/dev This commit looks good Details
2019-06-14 08:41:21 +02:00
Joan Sanchez 9c00e7e67c Autocomplete geolocation from postcode #1519 and #1531
gitea/salix/dev This commit looks good Details
2019-06-13 13:08:11 +02:00
Juan Ferrer 03205e01ae NPM fix, fdescribe removed
gitea/salix/dev This commit looks good Details
2019-06-13 09:49:36 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure
gitea/salix/dev This commit looks good Details
2019-06-07 13:07:23 +02:00
Joan Sanchez 2bbcc402de added treeview margin #1507
gitea/salix/dev This commit looks good Details
2019-06-06 15:01:47 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
2019-06-06 13:59:11 +02:00
Joan Sanchez 68f67f12d7 moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/dev This commit has test failures Details
2019-05-31 13:28:28 +02:00
Carlos Jimenez Ruiz 2c012b084a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-28 06:57:56 +02:00
Carlos Jimenez Ruiz 027602e18a #1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good Details
2019-05-27 15:10:57 +02:00
Carlos Jimenez Ruiz b6fbeb43e8 updated confirm html 2019-05-23 10:01:25 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449
gitea/salix/dev This commit looks good Details
2019-05-21 12:56:29 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360
gitea/salix/dev This commit has test failures Details
2019-05-17 13:27:51 +02:00
Carlos Jimenez Ruiz 417dc511f5 #1430 client.balance bug fix and e2e fix
gitea/salix/dev This commit looks good Details
2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +02:00
Joan Sanchez eae6a6f43c show spinner on load for table & catalog components #1424
gitea/salix/dev This commit looks good Details
2019-05-10 14:42:46 +02:00
Carlos Jimenez Ruiz da04d409a3 #1415 implementar color legend en worker.calendar
gitea/salix/dev This commit has test failures Details
2019-05-10 13:16:37 +02:00
Carlos Jimenez Ruiz 6f83f03400 #1411 Componente leyenda de colores 2019-05-09 14:17:44 +02:00
Bernat e43b7be526 1397 client.descriptor change icon to icon-basketadd
gitea/salix/dev This commit looks good Details
2019-05-07 11:55:47 +02:00
Joan Sanchez 6db35d744d multicheck checking all elements on pagination if checked 2019-04-30 11:20:37 +02:00
Joan Sanchez 6c3cea56aa fixed multi-check karma unit tests
gitea/salix/dev This commit looks good Details
2019-04-30 09:19:40 +02:00
Joan Sanchez a572130b6c propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit Details
2019-04-30 08:00:27 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374
gitea/salix/dev This commit looks good Details
2019-04-29 11:49:43 +02:00
Carlos Jimenez Ruiz 2ca85394f3 #1385 excluded tests
gitea/salix/dev This commit looks good Details
2019-04-26 16:10:51 +02:00
Joan Sanchez 145a5e85eb dropdown element name without translation
gitea/salix/dev This commit looks good Details
2019-04-26 12:41:30 +02:00
Joan Sanchez 16bf0b3448 regenerate invoice #1342
gitea/salix/dev This commit looks good Details
2019-04-26 08:52:43 +02:00
Juan Ferrer b6c95f262f Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-25 13:23:19 +02:00
Juan Ferrer 2ebc5de441 Nginx now logs original proxy src/dst hosts
gitea/salix/test This commit looks good Details
2019-04-25 13:22:49 +02:00
Joan Sanchez 76269a8a16 added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures Details
2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz 7595905c5e front unit test from invoiceOut now included in the index file
gitea/salix/dev This commit looks good Details
2019-04-17 11:31:37 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310
gitea/salix/dev This commit has test failures Details
2019-04-12 13:54:31 +02:00
Juan Ferrer faa0dc2b8d Popover relocate() fixes 2019-04-11 11:54:34 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315
gitea/salix/dev This commit looks good Details
2019-04-11 09:38:53 +02:00
Joan Sanchez 1dd8fdd96b input number select value when is zero
gitea/salix/dev This commit looks good Details
2019-04-11 08:05:46 +02:00
Joan Sanchez 3d71165682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-11 07:29:43 +02:00
Joan Sanchez 1e06a19884 input time refactor #1292 2019-04-11 07:29:41 +02:00
Juan Ferrer c3b4c18ba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 15:47:39 +02:00
Juan Ferrer c1b103d170 Popover fixes 2019-04-10 15:47:23 +02:00
Joan Sanchez 49ef341eb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 12:04:22 +02:00
Joan Sanchez 6f98d81db1 fixed input time 2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz e9102249be #1328 module home refactor
gitea/salix/dev This commit looks good Details
2019-04-10 11:49:39 +02:00
Bernat 2be3481138 #1309 add icon in routes module
gitea/salix/dev This commit looks good Details
2019-04-10 10:02:28 +02:00
Carlos Jimenez Ruiz 862f0b6c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 07:34:45 +02:00
Carlos Jimenez Ruiz eaad6c6f6e #1009 item.descriptor.popover 2019-04-10 07:20:23 +02:00
Joan Sanchez b3c00e5a29 updated td-editable styles #1313
gitea/salix/dev This commit looks good Details
2019-04-09 13:47:13 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Joan Sanchez d0dc192fc4 navigate to next claim section for salesAssistant #1119
gitea/salix/dev This commit has test failures Details
2019-04-08 09:01:10 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz 837a7b08cc #1300-1301 client.risk 2019-04-05 13:20:34 +02:00
Gerard cfdeb387a1 #1241 routes.tickets
gitea/salix/dev This commit looks good Details
2019-04-04 13:06:41 +02:00
Joan Sanchez c4c5c67b18 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 11:54:25 +02:00
Joan Sanchez bb039386f2 fixed input focus #1302
gitea/salix/master This commit looks good Details
2019-04-04 11:53:13 +02:00
Carlos Jimenez Ruiz 09288c2c12 merge 2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270 
ticket.index advanced search mostrar dias en el futuro
 2019-04-03 15:16:32 +02:00
Joan Sanchez 063360d645 fixed uvc throwing error #1280
gitea/salix/dev This commit looks good Details
2019-04-03 14:21:57 +02:00
Joan Sanchez dcf16e19fc fixed fonts
gitea/salix/dev This commit has test failures Details
2019-04-03 12:51:49 +02:00
Joan Sanchez f8035c9777 fixed calendar front unit tests
gitea/salix/dev This commit has test failures Details
2019-04-03 12:39:24 +02:00
Joan Sanchez d407fc7803 fixed calendar month name display
gitea/salix/dev There was a failure building this commit Details
2019-04-03 12:29:23 +02:00
Joan Sanchez f337799e39 tests & refactor calendar component #811 2019-04-03 11:34:58 +02:00
Carlos Jimenez Ruiz 287e4048e2 #1192 ticket.stepone en movil no muestra dropdown
gitea/salix/dev This commit looks good Details
2019-04-02 14:18:11 +02:00
Carlos Jimenez Ruiz 23bb644812 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-02 11:10:16 +02:00
Gerard 46f67a095d test merge
gitea/salix/dev This commit looks good Details
2019-04-02 11:05:30 +02:00
Carlos Jimenez Ruiz ef53d60c94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-02 11:05:16 +02:00
Carlos Jimenez Ruiz 570e2b5732 #1243 ticket.log columna worker 2019-04-02 11:04:53 +02:00
Gerard fcde321edf input time last changes rollback 2019-04-02 11:02:59 +02:00
Joan Sanchez a36c50b324 merge
gitea/salix/dev There was a failure building this commit Details
2019-04-02 09:51:05 +02:00
Joan Sanchez e198a94bc5 updated fonts & changed totalBox max width to 12em
gitea/salix/test This commit looks good Details
2019-04-01 11:17:50 +02:00
Joan Sanchez 3f1889daa3 fix open client card from ticket descriptor #1291
gitea/salix/dev This commit looks good Details
2019-04-01 09:48:22 +02:00
Joan Sanchez 84d3419656 added buscaman icon 2019-03-29 11:58:49 +01:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-03-29 07:37:23 +01:00
Gerard 5459254653 textField now saves the correct oldValue 2019-03-29 07:37:16 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Gerard 05eea132cd textfield oldValue now is called when it should
gitea/salix/test This commit looks good Details
2019-03-27 12:50:03 +01:00
Gerard f037fd8997 input time redone to handle the hours as expected 2019-03-26 12:21:29 +01:00
Joan Sanchez 500105675c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-26 07:29:57 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Carlos Jimenez Ruiz 1e150dbc8f #1264 cambiar ruta invoice a invoiceOut 2019-03-25 16:25:59 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good Details
2019-03-25 15:16:56 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147
gitea/salix/dev This commit looks good Details
2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz 92347cd9c4 #1233 route.index 2019-03-21 13:46:14 +01:00