 Joan Sanchez
|
c270ec6207
|
Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-02-11 15:06:41 +01:00 |
Jorge Padawan
|
f146c6a279
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
|
2021-02-11 11:15:10 +01:00 |
|
Jorge Padawan
|
745d25f0c7
|
Showed filter on browser search bar
|
2021-02-11 11:14:52 +01:00 |
 Carlos Jimenez Ruiz
|
8b97236f22
|
texfield no longer performs queries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-02-09 12:53:40 +01:00 |
|
Carlos Jimenez Ruiz
|
3d948ef317
|
warning color added lines with clientType loses
|
2021-02-09 10:43:19 +01:00 |
|
Carlos Jimenez Ruiz
|
5c466e1163
|
vn-fetched-tags visual refactor
|
2021-01-28 15:10:47 +01:00 |
|
Carlos Jimenez Ruiz
|
9a349e789c
|
added missin icon property to fixedPrice route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-22 12:15:03 +01:00 |
|
Carlos Jimenez Ruiz
|
f946e63a86
|
e2e path for item fixed price
|
2021-01-19 20:56:33 +01:00 |
|
Carlos Jimenez Ruiz
|
4f7c2f3afd
|
added placeholder and fixed css
|
2021-01-19 13:30:07 +01:00 |
|
Carlos Jimenez Ruiz
|
e859a1b837
|
removed incorrect icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-19 11:14:43 +01:00 |
|
Carlos Jimenez Ruiz
|
464366fdbe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed
|
2021-01-18 17:17:02 +01:00 |
|
Carlos Jimenez Ruiz
|
52a1e3f652
|
fixed price controller tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 16:32:54 +01:00 |
|
Carlos Jimenez Ruiz
|
8d6dd3e03a
|
minor refactors
|
2021-01-18 14:17:01 +01:00 |
|
Carlos Jimenez Ruiz
|
3251d737e6
|
fixed price index implementation
|
2021-01-18 14:16:39 +01:00 |
|
Jorge Padawan
|
97c8faaf50
|
Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-18 11:43:48 +01:00 |
|
Jorge Padawan
|
509de4fa0a
|
Fix for good practique code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-01-12 10:11:37 +01:00 |
|
Jorge Padawan
|
f45aa7937d
|
Added conditionals with rols to display or not the icons with link
|
2021-01-12 07:39:12 +01:00 |
|
Jorge Padawan
|
af55e2cc32
|
Add tooltip and modified sref for previews
|
2021-01-11 10:36:20 +01:00 |
|
Jorge Padawan
|
5a30bf5fa4
|
2650 add links to edit on summaries
|
2021-01-08 15:43:33 +01:00 |
|
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
|
Carlos Jimenez Ruiz
|
1ba83e7741
|
cancel button css + item module refactor
|
2020-12-15 16:07:34 +01:00 |
|
Carlos Jimenez Ruiz
|
cbaa95ebda
|
item module refactors
|
2020-12-13 13:54:17 +01:00 |
|
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-11 15:04:55 +01:00 |
|
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
 Bernat Exposito
|
96f603a44b
|
refactor descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-04 13:40:58 +01:00 |
|
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
|
Joan Sanchez
|
80bae4de0a
|
2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 08:22:54 +01:00 |
|
Joan Sanchez
|
c654e14cfe
|
2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 13:41:51 +01:00 |
|
Carlos Jimenez Ruiz
|
cb88265471
|
removed commented code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-17 11:04:17 +01:00 |
|
Carlos Jimenez Ruiz
|
55a1ae0348
|
added entry descriptor to item last entries
|
2020-11-16 14:43:35 +01:00 |
|
Carlos Jimenez Ruiz
|
a62698330a
|
small refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 09:45:41 +01:00 |
|
Carlos Jimenez Ruiz
|
95a62f66ad
|
2548 item diary columns width
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 16:58:56 +01:00 |
|
Carlos Jimenez Ruiz
|
9a8a32ee9b
|
denied & accepted no longer show deny icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 16:08:27 +01:00 |
|
Joan Sanchez
|
b65f48f0d9
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-04 14:35:27 +01:00 |
|
Joan Sanchez
|
a325ef2a78
|
2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-04 11:29:10 +01:00 |
|
Joan Sanchez
|
770b6a30bb
|
Added unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 14:35:04 +01:00 |
|
Joan Sanchez
|
3d86e59890
|
#2540 - Added entry descriptor popover to referenced places
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-27 12:02:49 +01:00 |
|
Joan Sanchez
|
0466d50c00
|
2518 - Item tag search
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-22 07:50:01 +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
|
b848fa52f2
|
2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-03 15:11:16 +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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
4336a303c0
|
Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate
|
2020-04-07 13:03:57 +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 |