Carlos Jimenez Ruiz
|
b6b84cfea7
|
more tests fixed + small refactors
|
2020-10-08 16:00:19 +02:00 |
 Carlos Jimenez Ruiz
|
b8b32d20bc
|
Merge branch 'dev' into 2486-last_entries_fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 07:12:00 +00:00 |
 Joan Sanchez
|
6ecf595a11
|
2486 - Changed date filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 08:52:11 +02:00 |
|
Joan Sanchez
|
0b8d8a4f65
|
Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 08:17:12 +02:00 |
 Juan Ferrer
|
fc6a19b60d
|
Merge branch 'dev' into 2177-userModule
|
2020-09-21 14:10:15 +02:00 |
|
Carlos Jimenez Ruiz
|
ed905341b3
|
removed autoload for where/searchF
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 11:17:40 +02:00 |
|
Carlos Jimenez Ruiz
|
aff6784662
|
corrected a typo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 10:57:59 +02:00 |
|
Carlos Jimenez Ruiz
|
c5dc84cbc2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1988-autocomplete_prefetch
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-17 20:16:29 +02:00 |
|
Carlos Jimenez Ruiz
|
ea077e8d4a
|
added auto-load to some combos
|
2020-09-17 20:12:52 +02:00 |
 Javi Gallego
|
1b13e58e10
|
item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-17 09:58:00 +02:00 |
|
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
gitea/salix/pipeline/head There was a failure building this commit
Details
LDAP test
RC1
SQL version changed
Tests fixes
Back & front tests fixed
All tests passed
Front and back tests plus some fixes
|
2020-09-11 14:36:16 +02:00 |
|
Joan Sanchez
|
d0ac1b621c
|
Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 09:06:11 +00:00 |
|
Joan Sanchez
|
004c9d7341
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-09 08:27:08 +02:00 |
|
Joan Sanchez
|
5ef9afdb53
|
Empty url fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-08 15:07:57 +02:00 |
|
Carlos Jimenez Ruiz
|
a00f64e7a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create
|
2020-09-03 16:29:38 +02:00 |
|
Joan Sanchez
|
b848fa52f2
|
2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-03 15:11:16 +02:00 |
|
Joan Sanchez
|
a3382300f9
|
2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-02 14:08:56 +02:00 |
|
Carlos Jimenez Ruiz
|
605fbe7999
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-02 13:09:30 +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
|
cb4fe1f610
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 07:37:48 +00:00 |
|
Joan Sanchez
|
5a16a10b8f
|
Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 06:55:13 +00:00 |
|
Javi Gallego
|
b4952002a3
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 06:49:09 +00:00 |
|
Joan Sanchez
|
0a542a2057
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-01 07:38:03 +02:00 |
|
Joan Sanchez
|
8aa9918d84
|
2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 15:03:00 +02:00 |
|
Javi Gallego
|
daee9081d1
|
test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 12:29:51 +02:00 |
|
Joan Sanchez
|
4a870213ce
|
Merge branch 'dev' into 2408-item_request
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-31 09:03:41 +00: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
|
c70ad808a0
|
refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 17:54:43 +02:00 |
|
Carlos Jimenez Ruiz
|
a66656dcce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-27 15:14:41 +02:00 |
|
Joan Sanchez
|
7c4d9b9460
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:31:54 +02:00 |
|
Joan Sanchez
|
a75938b6d0
|
Updated error handler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:23:40 +02:00 |
|
Joan Sanchez
|
55d047c0dd
|
Renamed error var
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:11:22 +02:00 |
|
Joan Sanchez
|
fd67a85fe8
|
Changed to 1 second
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 14:09:21 +02:00 |
|
Joan Sanchez
|
6f3fb83cd7
|
Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-27 13:53:11 +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
|
d23e3eff76
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-26 09:49:52 +02:00 |
|
Joan Sanchez
|
e12612b0ea
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-26 08:28:41 +02:00 |
|
Joan Sanchez
|
ea4f561bcf
|
Added try-catch
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-08-26 07:33:00 +02:00 |
|
Joan Sanchez
|
74f3229fc5
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-25 13:45:20 +02:00 |
|
Joan Sanchez
|
4ef540c8f3
|
Changed download path
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 09:48:02 +02:00 |
|
Joan Sanchez
|
2a7495bac9
|
Image queue fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-08-18 09:45:26 +02:00 |
|
Joan Sanchez
|
1ef6637ad3
|
Added clearInterval()
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 08:37:39 +02:00 |
|
Joan Sanchez
|
8968f41b75
|
Queue changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-18 08:10:40 +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
|
dd5e71c9fc
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-17 09:42:29 +02:00 |
|
Joan Sanchez
|
a10e091b62
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 16:26:35 +02:00 |
|
Joan Sanchez
|
7a3de746cc
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 14:00:40 +02:00 |
|
Joan Sanchez
|
bbf15da16f
|
Changed tmp uri
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 13:38:52 +02:00 |
|
Joan Sanchez
|
c0794808f0
|
Updated tmp directory
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 13:09:53 +02:00 |
|
Joan Sanchez
|
c9ed17d981
|
Changes to dowload item photos endpoint
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-13 12:16:25 +02:00 |
|
Carlos Jimenez Ruiz
|
6007506633
|
wider space for tags
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-31 11:43:56 +02:00 |
|
Carlos Jimenez Ruiz
|
c62801e741
|
modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-24 14:22:30 +02:00 |
|
Carlos Jimenez Ruiz
|
6913f2db72
|
$httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-23 17:10:07 +02:00 |
|
Carlos Jimenez Ruiz
|
4ca004f833
|
angular.mock.injet shorten to inject
|
2020-07-23 16:46:16 +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 Sanchez
|
da3d20bb16
|
Restored limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-15 12:11:44 +02:00 |
|
Joan Sanchez
|
72dfa4262a
|
Removed limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-15 12:00:38 +02:00 |
|
Joan Sanchez
|
68c19fa22a
|
Removed test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 11:17:53 +02:00 |
|
Joan Sanchez
|
e557bd2815
|
Renamed method
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 11:16:50 +02:00 |
|
Joan Sanchez
|
3074c9ce35
|
Fixed async image registration
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-14 09:32:50 +02:00 |
|
Joan Sanchez
|
80075a6471
|
Added limit
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:46:00 +02:00 |
|
Joan Sanchez
|
99aa6b666d
|
Mkdir recursive
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:31:50 +02:00 |
|
Joan Sanchez
|
838b8a5382
|
Fix scope var
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:22:19 +02:00 |
|
Joan Sanchez
|
ee19ea2993
|
Restricted to itemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 14:13:21 +02:00 |
|
Joan Sanchez
|
ccc5b95b48
|
Updated mount paths
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-13 12:23:47 +02:00 |
|
Joan Sanchez
|
159b5f3bb8
|
#2351 Item image queue scheduler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-13 11:58:31 +02:00 |
|
Javi Gallego
|
762c39eb23
|
:: para watcher
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-08 07:52:30 +02:00 |
|
Joan Sanchez
|
ca19581a5d
|
Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-03 11:09:19 +00:00 |
Bernat Exposito Domenech
|
1cd9c75468
|
fix item diary descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:37:01 +02:00 |
|
Joan Sanchez
|
613937dc8d
|
Fixed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:21:03 +02:00 |
|
Joan Sanchez
|
f71a2a3665
|
Removed isOk param
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 11:58:53 +02:00 |
|
Bernat Exposito Domenech
|
0b3608433c
|
item diary, fix ticket descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 10:37:17 +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
|
a0767a6ea2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 10:56:40 +02:00 |
|
Juan Ferrer
|
3e5bab41d3
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-01 13:47:33 +02:00 |
|
Juan Ferrer
|
3fcb76246d
|
Merge branch 'master' into test
|
2020-06-01 13:38:59 +02:00 |
|
Joan Sanchez
|
3d8bc3b7b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-01 13:32:35 +02:00 |
|
Joan Sanchez
|
c188da88e8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-01 13:31:08 +02:00 |
|
Javi Gallego
|
5188f80da5
|
Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:47:48 +02:00 |
|
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
 Bernat Exposito
|
17ef761ba4
|
Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-05-26 07:59:17 +00:00 |
Joan Sanchez
|
44160d2f3c
|
Changed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:11:36 +02:00 |
|
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:08:09 +02:00 |
|
Javi Gallego
|
0f718ad065
|
Merge branch 'dev' into 2242-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-22 07:56:00 +02:00 |
|
Bernat Exposito Domenech
|
52241e6f2c
|
update itemLastENtries
|
2020-05-21 15:26:00 +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
|
4133021e5c
|
fix translate on plural
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 08:52:20 +02:00 |
|
Javi Gallego
|
670c5936ce
|
test2
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 13:11:22 +02:00 |
|
Javi Gallego
|
529bd5673c
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 13:06:59 +02:00 |
|
Juan Ferrer
|
c998097ba1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 12:30:00 +02:00 |
|
Javi Gallego
|
ff03133277
|
test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-19 12:21:02 +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 |
|
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
|
Juan Ferrer
|
b94c97d322
|
Hotfix: Clone option added to vnItemDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-13 17:51:27 +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 |
|
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 18:42:50 +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 |
|
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 |