Commit Graph

6130 Commits

Author SHA1 Message Date
Joan Sanchez 137f701434 changed order
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-10-22 14:20:50 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-22 13:44:36 +02:00
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit Details
2019-10-21 14:21:52 +02:00
Joan Sanchez 8e1d594a13 was saving data on page load #1820
gitea/salix/dev There was a failure building this commit Details
2019-10-21 13:43:17 +02:00
Joan Sanchez 1739a71e0d removed QR barcode margins
gitea/salix/dev This commit looks good Details
2019-10-21 11:33:40 +02:00
Joan Sanchez ff1924e442 added item-label report and configurable report options
gitea/salix/dev This commit looks good Details
2019-10-21 11:09:18 +02:00
Joan Sanchez 188f4ae3bf mark item diary line
gitea/salix/dev This commit looks good Details
2019-10-21 11:08:41 +02:00
Bernat 939c507fba #1810 El método listPackaging filtrar por isPackagingReturnable 2019-10-21 09:16:52 +02:00
Bernat 6adeb689eb Tarea #1814 refactor fixtures userPhone
gitea/salix/dev This commit looks good Details
2019-10-21 08:52:42 +02:00
Bernat e9f65cd2a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-21 08:42:30 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Bernat 6477a1458d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-21 07:24:56 +02:00
Joan Sanchez 55f3390f85 added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures Details
2019-10-21 07:08:47 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer 470b966e85 Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 22:54:25 +02:00
Juan Ferrer de9a8443ca Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 22:28:08 +02:00
Juan Ferrer 485bc43b13 Style fixes 2019-10-18 22:07:55 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 43fd8fe75e Merge 2019-10-18 21:37:28 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Bernat 85bcb356d4 1778 Refactor worker.phone 2019-10-18 13:52:15 +02:00
Bernat b78447bdd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-18 13:51:24 +02:00
Joan Sanchez 18b0ae034c #1815 - show summary correct photos on claim index
gitea/salix/dev This commit looks good Details
2019-10-18 09:53:30 +02:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz bdbadaf61a #1819 fixtures
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-17 14:30:52 +02:00
Joan Sanchez f78fec42cc Merge branch '1757-drag_and_drop_department' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2019-10-17 12:13:18 +00:00
Joan Sanchez f2a05ff915 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 14:08:29 +02:00
Joan Sanchez 2a9158a593 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-17 14:06:52 +02:00
Joan Sanchez 703c882bc1 solved conflicts
gitea/salix/test Something is wrong with the build of this commit Details
2019-10-17 14:06:24 +02:00
Joan Sanchez 43a2c2e939 insert timeControl from procedure
gitea/salix/master This commit looks good Details
2019-10-17 14:03:22 +02:00
Joan Sanchez 6f691353a3 solved conflicts
gitea/salix/test Something is wrong with the build of this commit Details
2019-10-17 14:03:07 +02:00
Bernat 7ee03d91f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-17 14:01:58 +02:00
Joan Sanchez e1cea99cc0 insert timeControl from procedure
gitea/salix/dev This commit looks good Details
2019-10-17 14:01:23 +02:00
Joan Sanchez 04785d3f72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:28:07 +02:00
Joan Sanchez b2b76b05d8 css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:27:50 +02:00
Carlos Jimenez Ruiz 8ce804a099 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-17 11:56:12 +02:00
Bernat 24861fe5b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-17 11:55:36 +02:00
Joan Sanchez 4ca001d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:09:03 +02:00
Joan Sanchez 79f9e616d2 added treeview unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:08:40 +02:00
Carlos Jimenez Ruiz e0d9f69aef corrected a description 2019-10-16 10:59:42 +02:00
Juan Ferrer dbe6161c69 Tests fixed
gitea/salix/dev This commit looks good Details
2019-10-16 09:54:02 +02:00
Joan Sanchez 6d159c50a0 css fixes
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 09:52:46 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 08:56:13 +02:00
Joan Sanchez 9e0ab17d47 removed prefetch
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-16 08:39:45 +02:00
Juan Ferrer e1e65e8b2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-16 08:23:16 +02:00
Bernat 061e978a26 #1758 Añadir los alias como prefijos en los filtros 2019-10-16 08:08:10 +02:00
Carlos Jimenez Ruiz a501cb8887 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-16 08:03:09 +02:00
Carlos Jimenez Ruiz b37e308a4b #1811 send.js unit test 2019-10-16 08:01:34 +02:00