 Bernat Exposito
|
6fc14d569c
|
Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 08:32:39 +00:00 |
 Joan Sanchez
|
cb8e9655af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-13 07:22:12 +01:00 |
 Juan Ferrer
|
4b46b0787b
|
User syncronization fixes, improvements, refactor
|
2020-11-12 23:20:25 +01:00 |
|
Bernat Exposito
|
5be616ad91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-12 08:04:38 +01:00 |
|
Bernat Exposito
|
eb8931bca5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 13:57:37 +01:00 |
|
Joan Sanchez
|
db4f226f6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-11 12:39:15 +01:00 |
|
Bernat Exposito
|
1e95f0105a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
|
2020-11-11 10:52:46 +01:00 |
|
Bernat Exposito
|
75ffa108fb
|
refactor back download
|
2020-11-11 10:52:35 +01:00 |
|
Joan Sanchez
|
08af948eb0
|
Merge branch 'dev' into 2574-itemTag_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-10 12:39:17 +00:00 |
|
Bernat Exposito
|
e4e4f37609
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-10 08:46:37 +01:00 |
|
Bernat Exposito
|
4ea5993dcc
|
user image
|
2020-11-10 08:39:34 +01:00 |
|
Juan Ferrer
|
2628faa9d0
|
Sync hotfixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-06 22:55:47 +01:00 |
 Carlos Jimenez Ruiz
|
ead0994032
|
timeControlCalculate procedure updated
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-05 10:33:02 +01:00 |
|
Joan Sanchez
|
4c88a46b63
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor
|
2020-11-05 09:12:25 +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 |
|
Bernat Exposito
|
2dc51e6125
|
update acl
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-03 09:34:50 +01:00 |
|
Bernat Exposito
|
61c3d2233b
|
delete old sqls
|
2020-11-03 09:34:35 +01:00 |
|
Carlos Jimenez Ruiz
|
d533e9da2e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-03 09:22:07 +01:00 |
|
Bernat Exposito
|
8976034bb0
|
fix fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-03 08:15:49 +01:00 |
|
Bernat Exposito
|
f2ee122778
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
|
2020-11-03 07:51:25 +01:00 |
|
Juan Ferrer
|
fc957eda6c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:45 +01:00 |
|
Juan Ferrer
|
b3ab1fe059
|
Sync fixes & improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 19:58:07 +01:00 |
|
Joan Sanchez
|
413283288f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 15:38:23 +01:00 |
|
Bernat Exposito
|
b2d69127cb
|
Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 14:31:36 +00:00 |
|
Joan Sanchez
|
15b7280222
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 14:31:39 +01:00 |
|
Joan Sanchez
|
590de622f5
|
Added model validations
|
2020-11-02 14:30:33 +01:00 |
|
Bernat Exposito
|
d07e95a7e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-11-02 11:14:42 +01:00 |
|
Bernat Exposito
|
e700f11863
|
acls
|
2020-11-02 11:14:21 +01:00 |
|
Bernat Exposito
|
7e2555ddf1
|
export production
|
2020-11-02 10:58:27 +01:00 |
|
Juan Ferrer
|
b6da896fe7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-02 10:11:34 +01:00 |
|
Bernat Exposito
|
d6c5e0ef0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-02 09:27:35 +01:00 |
|
Joan Sanchez
|
565bd013bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
|
2020-11-02 08:32:46 +01:00 |
|
Juan Ferrer
|
e25a978b19
|
Merge branch 'test' into dev
|
2020-11-01 00:03:05 +01:00 |
|
Juan Ferrer
|
9b4f8697b9
|
User sync fixes
|
2020-10-31 21:16:58 +01:00 |
|
Bernat Exposito
|
459f4068ab
|
fix fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 11:05:16 +01:00 |
|
Juan Ferrer
|
15c39f93ca
|
root id changed from 0 to 100 due to loopback join problems with id 0
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 01:10:32 +01:00 |
|
Juan Ferrer
|
9b563cb8bf
|
LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-31 00:02:27 +01:00 |
 Javi Gallego
|
b50ae7b8ca
|
testback arreglados
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 15:50:59 +01:00 |
|
Joan Sanchez
|
245b32a47f
|
Added section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-30 15:11:45 +01:00 |
|
Bernat Exposito
|
39de960b9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact
|
2020-10-30 10:23:47 +01:00 |
|
Bernat Exposito
|
7200aa3dfc
|
fixtures and sql for supplierContact
|
2020-10-30 10:23:42 +01:00 |
|
Javi Gallego
|
59cbe276f4
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 10:08:38 +01:00 |
|
Javi Gallego
|
31b5a140d4
|
test completados
|
2020-10-30 10:07:53 +01:00 |
|
Javi Gallego
|
3fdc9c315d
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:40:47 +01:00 |
|
Bernat Exposito
|
ea8d9e70b0
|
supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-30 08:27:02 +01:00 |
|
Bernat Exposito
|
792b689b58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log
|
2020-10-29 13:40:21 +01:00 |
Bernat Exposito Domenech
|
a5e6f99b1f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
|
2020-10-29 08:06:50 +01:00 |
|
Bernat Exposito Domenech
|
77bc1b562e
|
create section supplier log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-28 09:08:27 +01:00 |
|
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 12:16:57 +01:00 |
|
Bernat Exposito Domenech
|
1699e0619c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-26 08:43:20 +01:00 |
|
Bernat Exposito Domenech
|
58168e78ab
|
test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-10-26 08:38:43 +01:00 |
|
Bernat Exposito Domenech
|
fe2f12cd8f
|
first test step
|
2020-10-22 09:35:11 +02:00 |
|
Javi Gallego
|
7dfe7ee379
|
Merge branch 'dev' into 2510-client-address-create-test
|
2020-10-21 12:35:09 +02:00 |
|
Joan Sanchez
|
5daee49382
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 11:52:02 +02:00 |
|
Javi Gallego
|
ef7a886d86
|
Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-21 10:13:04 +02:00 |
|
Joan Sanchez
|
f7e9372bf0
|
2525 - Change to past date
|
2020-10-20 15:12:00 +02:00 |
|
Javi Gallego
|
4aea284703
|
WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 14:42:23 +02:00 |
|
Bernat Exposito Domenech
|
7eed2ddd59
|
export structure and fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-20 12:47:37 +02:00 |
Carlos Jimenez Ruiz
|
cc99c1e980
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation
|
2020-10-16 13:04:58 +02:00 |
|
Bernat Exposito
|
0fbbe9b2ae
|
Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-10-15 07:57:57 +00:00 |
|
Bernat Exposito Domenech
|
cc35998f62
|
new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-15 08:15:04 +02:00 |
|
Joan Sanchez
|
6fa8aae161
|
2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-14 11:33:42 +02:00 |
|
Joan Sanchez
|
e48effca08
|
Stop container before remove
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-13 12:28:58 +02:00 |
|
Joan Sanchez
|
f00828cf57
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-06 05:44:11 +00:00 |
|
Javi Gallego
|
77064d85a0
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 12:54:02 +00:00 |
|
Javi Gallego
|
531bb6da25
|
quito copy
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 13:22:56 +02:00 |
|
Joan Sanchez
|
86025b88e3
|
Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 09:36:02 +00:00 |
|
Joan Sanchez
|
cef2dc982f
|
Updated sql
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 10:47:12 +02:00 |
|
Joan Sanchez
|
ad11a92c87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar
|
2020-10-05 10:02:44 +02:00 |
|
Joan Sanchez
|
cdde4d95d7
|
Added filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-05 07:53:03 +02:00 |
|
Joan Sanchez
|
420dfdbdff
|
Send notification by email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-02 12:23:48 +02:00 |
|
Javi Gallego
|
8d1709ea51
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 16:46:33 +02:00 |
|
Javi Gallego
|
78e22df177
|
test e2e de expense ok
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 16:45:28 +02:00 |
|
Juan Ferrer
|
6d8b13423f
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-10-01 10:02:19 +02:00 |
|
Javi Gallego
|
2714857227
|
Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-30 14:07:38 +02:00 |
|
Juan Ferrer
|
611aa9cafa
|
SQL hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 10:55:04 +02:00 |
|
Joan Sanchez
|
ec2385cd15
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 06:53:14 +00:00 |
|
Bernat Exposito Domenech
|
5f9ef3aea3
|
export structure db
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-29 07:37:29 +02:00 |
|
Juan Ferrer
|
991bece64a
|
SQL fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 21:25:53 +02:00 |
|
Juan Ferrer
|
82de0a30a4
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-28 10:41:16 +02:00 |
|
Juan Ferrer
|
5264b615d4
|
Optimización docker salix-db
|
2020-09-28 10:40:50 +02:00 |
|
Joan Sanchez
|
0438171a47
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-28 06:09:48 +00:00 |
|
Bernat Exposito Domenech
|
790c9bfe6f
|
update models and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-25 14:50:04 +02:00 |
|
Javi Gallego
|
c909470f41
|
merge
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-25 08:10:37 +02:00 |
|
Joan Sanchez
|
de3c7acb08
|
Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 12:30:44 +00:00 |
|
Joan Sanchez
|
164f636f3f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:02:16 +02:00 |
|
Joan Sanchez
|
44e23ca560
|
Removed sql version
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-24 09:00:42 +02:00 |
|
Bernat Exposito Domenech
|
ca41b93995
|
mail models and fix checkInbox
|
2020-09-23 08:09:06 +02:00 |
|
Bernat Exposito Domenech
|
d4c819ebf7
|
new models and fixtures
|
2020-09-23 07:59:10 +02:00 |
|
Bernat Exposito Domenech
|
ce1c4e6f60
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
|
2020-09-22 14:00:52 +02:00 |
|
Bernat Exposito Domenech
|
06f03c6b84
|
mail models and fix checkInbox
|
2020-09-22 13:59:00 +02:00 |
|
Juan Ferrer
|
81de97c071
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-21 18:33:28 +02:00 |
|
Juan Ferrer
|
9528fe0a19
|
Merge branch 'dev' into 2381-mariaDB
|
2020-09-21 17:47:55 +02:00 |
|
Juan Ferrer
|
5e056c315f
|
Tests fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 17:46:40 +02:00 |
|
Juan Ferrer
|
1c621cff85
|
Fixtures fixes
|
2020-09-21 16:43:17 +02:00 |
|
Juan Ferrer
|
3880e21ce3
|
Test fixes
|
2020-09-21 16:09:34 +02:00 |
|
Juan Ferrer
|
fc6a19b60d
|
Merge branch 'dev' into 2177-userModule
|
2020-09-21 14:10:15 +02:00 |
|
Juan Ferrer
|
b9c526c29c
|
LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 13:24:43 +02:00 |
|
Javi Gallego
|
8fb674819a
|
ticket service
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-21 10:35:39 +02:00 |
|
Carlos Jimenez Ruiz
|
f50f4514fd
|
fixtures enhanced for tags
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-16 11:11:18 +02:00 |