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 |
|
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
|
e1cea99cc0
|
insert timeControl from procedure
gitea/salix/dev This commit looks good
Details
|
2019-10-17 14:01:23 +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 |
|
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 |
|
Bernat
|
25bd28990a
|
Refactor #1812 refactor phone
gitea/salix/dev This commit looks good
Details
|
2019-10-15 14:44:00 +02:00 |
|
Joan Sanchez
|
3853fc7404
|
descuadre de horas #1766 rollback
gitea/salix/dev This commit looks good
Details
|
2019-10-15 08:50:11 +02:00 |
|
Bernat
|
793dd06e8d
|
merge
gitea/salix/1763-worker_time_control_add This commit looks good
Details
|
2019-10-15 07:30:23 +02:00 |
 Juan Ferrer
|
7dfd1fe6f2
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-10-11 17:43:29 +02:00 |
|
Joan Sanchez
|
8af7f13ac6
|
#1763 insert from procedure
gitea/salix/1763-worker_time_control_add This commit looks good
Details
|
2019-10-10 14:11:23 +02:00 |
 Javi Gallego
|
3e71338d94
|
borra tabla temporal
gitea/salix/dev This commit looks good
Details
|
2019-10-10 12:14:21 +02:00 |
|
Juan Ferrer
|
a9d5e87078
|
vnField alpha with ngModel
|
2019-10-10 00:47:29 +02:00 |
|
Juan Ferrer
|
fc09d76422
|
Merge
|
2019-10-08 23:57:54 +02:00 |
|
Juan Ferrer
|
757fc6fe23
|
vnField stable & applied to all field except vnTextfield
|
2019-10-08 23:57:02 +02:00 |
|
Joan Sanchez
|
90ca883962
|
solved conflicts
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 13:06:50 +02:00 |
|
Joan Sanchez
|
9358602471
|
#15 Updated changes width dev
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 13:03:19 +02:00 |
|
Joan Sanchez
|
4025c624b3
|
#15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 12:48:12 +02:00 |
|
Joan Sanchez
|
eb655215f4
|
merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 09:23:29 +02:00 |
|
Joan Sanchez
|
b32cf4a386
|
last refactor
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 07:22:38 +02:00 |
|
Juan Ferrer
|
b12a666653
|
CSS padding/margin refactor, glob styles in core
|
2019-10-05 00:16:57 +02:00 |
|
Juan Ferrer
|
9b385f4b90
|
#1749 Fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-04 13:12:53 +02:00 |
|
Joan Sanchez
|
9919f9a46e
|
add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-04 07:41:24 +02:00 |
|
Juan Ferrer
|
ec9797a4b3
|
vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good
Details
|
2019-10-02 21:02:49 +02:00 |
|
Juan Ferrer
|
87add6cd33
|
vnDataViewer
|
2019-10-02 19:24:42 +02:00 |
|
Joan Sanchez
|
6a184496d6
|
treeview refactor 2
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-02 14:12:17 +02:00 |
|
Joan Sanchez
|
9473636b5b
|
treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-02 09:54:52 +02:00 |
|
Juan Ferrer
|
76604744d1
|
Global & client style fixes
|
2019-10-01 16:17:57 +02:00 |
|
Joan Sanchez
|
183d770483
|
first changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-01 15:09:55 +02:00 |
|
Juan Ferrer
|
4e4919c1e2
|
Agency fixes & exclusion with left calendar
|
2019-10-01 13:45:43 +02:00 |
 Carlos Jimenez Ruiz
|
cef28307d0
|
#1660 ticket.log si el usuario es un cliente falla
|
2019-10-01 10:47:06 +02:00 |
|
Juan Ferrer
|
679c6af0df
|
#1297 Angular material removed from project
|
2019-09-30 20:46:22 +02:00 |
|
Juan Ferrer
|
2bcdcaa133
|
#1285 fixed, vnInputTime fixes
|
2019-09-30 11:30:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b12d0388c9
|
#1074 Undo changes button for forms
|
2019-09-18 09:41:25 +02:00 |
|
Carlos Jimenez Ruiz
|
2251fb65ad
|
#1615 migrar karma a jest
|
2019-09-13 16:09:14 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
gitea/salix/dev This commit looks good
Details
|
2019-09-05 13:06:40 +02:00 |
|
Bernat
|
15097313a2
|
#1651 worker.json
gitea/salix/dev This commit looks good
Details
|
2019-08-27 11:12:17 +02:00 |
|
Bernat
|
7e1eba53f1
|
Refactor #1627 worker.timeControl
|
2019-08-06 12:25:53 +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 |
|
Bernat
|
098dd7b235
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-07-31 10:45:03 +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 |
|
Bernat
|
116a34d04a
|
fix test
|
2019-07-31 09:17:26 +02:00 |
|
Carlos Jimenez Ruiz
|
a2a9dfd7e5
|
#1567 refactor logs - worker descriptor
|
2019-07-03 11:08:44 +02:00 |
|
Bernat
|
dd38a21e8d
|
Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-07-01 11:56:16 +02:00 |
|
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:03:03 +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 |
|
Bernat
|
682a75ac76
|
#1533 update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-06-25 14:00:55 +02:00 |
|
Joan Sanchez
|
340e7b8495
|
round worker calendar holidays #1547
gitea/salix/dev This commit has test failures
Details
|
2019-06-21 09:56:39 +02:00 |
|
Carlos Jimenez Ruiz
|
73ccf9a107
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-19 14:42:59 +02:00 |
|
Juan Ferrer
|
edfa112874
|
Merge with master
gitea/salix/test This commit looks good
Details
|
2019-06-17 11:33:34 +02:00 |
|
Juan Ferrer
|
da01d52756
|
Secret removed from worker/pbx
gitea/salix/master This commit looks good
Details
|
2019-06-17 11:14:45 +02:00 |
|
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
|
Joan Sanchez
|
a9aaa3329a
|
fixed worker calendar
gitea/salix/dev This commit looks good
Details
|
2019-06-14 08:17:12 +02:00 |
|
Joan Sanchez
|
9a18d0bd8c
|
fixed worker calendar
gitea/salix/master This commit looks good
Details
|
2019-06-14 08:15:14 +02:00 |
|
Bernat
|
5ce33fbefd
|
Bug/Test #1515 Dump structure de production a dev
|
2019-06-11 12:25:02 +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
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
|
Joan Sanchez
|
073c457abb
|
Merge branch 'test'
gitea/salix/master This commit looks good
Details
|
2019-06-05 08:56:56 +02:00 |
|
Javi Gallego
|
0f5ebf42ec
|
Tarea #1506 worker.pbx quitar campo password
gitea/salix/dev This commit has test failures
Details
|
2019-06-04 12:54:41 +02:00 |
quique
|
a6a6ea5b06
|
WorkerTimerControl App
gitea/salix/test This commit looks good
Details
|
2019-06-03 09:41:54 +02:00 |
|
quique
|
b034333cdb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-03 09:20:35 +02:00 |
|
quique
|
8005b0a892
|
WorkerTimeControl App
|
2019-06-03 09:20:20 +02:00 |
|
Bernat
|
62fe9d760c
|
#1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good
Details
|
2019-06-03 08:01:24 +02:00 |
|
Joan Sanchez
|
a138465071
|
moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/master This commit looks good
Details
|
2019-05-31 13:54:15 +02:00 |
|
Joan Sanchez
|
5abb82faab
|
moveNext() movePrevious() moves now to day 1 to prevent a month jump
gitea/salix/test This commit looks good
Details
|
2019-05-31 13:33:37 +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 |
|
Bernat
|
97459bd7e6
|
1497
gitea/salix/test This commit looks good
Details
|
2019-05-31 11:33:28 +02:00 |
|
Joan Sanchez
|
cc72432a37
|
accessType refactor #1460
gitea/salix/master This commit looks good
Details
|
2019-05-22 12:38:51 +02:00 |
|
Joan Sanchez
|
f73b42b0be
|
accessType refactor #1460
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:35:24 +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 |
|
Bernat
|
b86cf1d98a
|
1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good
Details
|
2019-05-17 07:34:25 +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 |
|
Bernat
|
83898c9ba7
|
1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good
Details
|
2019-05-07 11:32:35 +02:00 |
|
Joan Sanchez
|
c8bf9d0d7b
|
fixed worker calendar error for local holidays
gitea/salix/dev This commit looks good
Details
|
2019-04-30 11:43:26 +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
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
|
Carlos Jimenez Ruiz
|
e11d33eb27
|
worker descriptor refactor
|
2019-04-25 08:28:23 +02:00 |
|
Carlos Jimenez Ruiz
|
8d5cc93ddb
|
#1359 refactor absences
|
2019-04-23 13:29:52 +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 |
|
Bernat
|
9a86929e3a
|
#1344 create test for worker filter
gitea/salix/dev This commit looks good
Details
|
2019-04-16 13:10:06 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Bernat
|
0d680bdaed
|
#1343 update worker filter
|
2019-04-16 07:59:29 +02:00 |
|
Bernat
|
6a68003d84
|
#1212 refactor claim filter
gitea/salix/dev This commit looks good
Details
|
2019-04-15 11:06:42 +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
|
9ce1e93da7
|
changed worker holidays length
|
2019-04-09 13:38:02 +02:00 |
|
Joan Sanchez
|
afafbdda95
|
fixed back unit test
gitea/salix/dev This commit looks good
Details
|
2019-04-03 14:04:25 +02:00 |
|
Joan Sanchez
|
e433828f7c
|
Merge branch 'master' into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-03 11:55:18 +02:00 |
|
Joan Sanchez
|
892e267a16
|
fixed worker calendar total holidays #1299
gitea/salix/master This commit looks good
Details
|
2019-04-03 11:36:10 +02:00 |
|
Joan Sanchez
|
f337799e39
|
tests & refactor calendar component #811
|
2019-04-03 11:34:58 +02:00 |
|
Carlos Jimenez Ruiz
|
570e2b5732
|
#1243 ticket.log columna worker
|
2019-04-02 11:04:53 +02:00 |
|
Joan Sanchez
|
6d51ef4187
|
fixed absence test
gitea/salix/dev This commit looks good
Details
|
2019-04-01 08:56:18 +02:00 |
|
Carlos Jimenez Ruiz
|
14bd970fbc
|
#1265 worker.pbx da error si no tiene extensión
|
2019-03-29 10:51:02 +01:00 |
|
Joan Sanchez
|
2ca5def095
|
build english locale on dist directory #1268
gitea/salix/dev This commit looks good
Details
|
2019-03-26 12:05:53 +01:00 |
Bernat
|
4e1e3bdeeb
|
cau 10270 refactor fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-26 10:25:11 +01:00 |
|
Joan Sanchez
|
3df5f4cae9
|
replaced numeric fields with input-number #1138
|
2019-03-26 07:29:45 +01:00 |
|
Joan Sanchez
|
c5e953f922
|
worker calendar front & back unit tests #1248
gitea/salix/dev This commit looks good
Details
|
2019-03-22 12:51:44 +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
|
d7d8bff92b
|
#1196 worker.descriptor correo
|
2019-03-15 12:58:26 +01:00 |
Gerard
|
5fcb9f61ab
|
Merge branch 'master' into test
gitea/salix/test This commit looks good
Details
|
2019-03-13 16:09:14 +01:00 |
|
Gerard
|
0a95f1b299
|
#1229 general search of worker searckpanel now searchs users
gitea/salix/master This commit looks good
Details
|
2019-03-13 16:08:04 +01:00 |
|
Joan Sanchez
|
92170c34d5
|
worker department #1133
gitea/salix/dev This commit has test failures
Details
|
2019-03-12 15:04:09 +01:00 |
|
Gerard
|
3afedbd89b
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-03-11 08:02:06 +01:00 |
|
Gerard
|
f6eb8315a3
|
#999 worker.index buscador
gitea/salix/test This commit looks good
Details
|
2019-03-11 08:00:49 +01:00 |
|
Carlos Jimenez Ruiz
|
78103137bb
|
Test #1221 e2e worker.pbx
|
2019-03-08 14:46:01 +01:00 |
|
Carlos Jimenez Ruiz
|
aceecd9c7a
|
Tarea #1197 worker.centralita
|
2019-03-08 09:41:53 +01:00 |
|
Carlos Jimenez Ruiz
|
1e89b6977a
|
#1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good
Details
|
2019-02-27 13:10:26 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Juan Ferrer
|
e42da544cd
|
Styles fixed
|
2019-02-21 10:10:38 +01:00 |
|
Joan Sanchez
|
20843a9068
|
updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:59:39 +01:00 |
|
Joan Sanchez
|
40d765adc1
|
removed fi from worker module
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:16:19 +01:00 |
|
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
|
Gerard
|
b7db5f969b
|
fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:09:50 +01:00 |
|
Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Carlos Jimenez Ruiz
|
b034a8fab7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 15:33:11 +01:00 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
92a645f395
|
#1122 + worker descriptor popover + small refactors for worker.nickname
|
2019-02-15 12:39:21 +01:00 |
|
Juan Ferrer
|
f52d306db4
|
Color style unified
|
2019-02-08 17:49:51 +01:00 |
|
Juan Ferrer
|
1dbb75a1b8
|
vnSideMenu, vnBackground, style fixes
|
2019-02-05 09:13:15 +01:00 |
|
Juan Ferrer
|
3f08ab1b22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 11:06:39 +01:00 |
|
Juan Ferrer
|
e63e4319cd
|
Worker module fixes
|
2019-02-01 09:31:01 +01:00 |
|
Carlos Jimenez Ruiz
|
d109e480a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 14:14:52 +01:00 |
|
Carlos Jimenez Ruiz
|
00ccf9a4a0
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:14:39 +01:00 |
|
Bernat
|
19cfa1ab75
|
upadte structure db and models
|
2019-01-31 09:12:29 +01:00 |
|
Juan Ferrer
|
f643261a85
|
Styles fixed, change language moved to user config popover
|
2019-01-31 00:33:43 +01:00 |
|
Juan Ferrer
|
1dc8cafc73
|
Style & translation fixes
|
2019-01-30 23:47:06 +01:00 |
|
Juan Ferrer
|
259079b051
|
Translations fixed
|
2019-01-30 14:13:47 +01:00 |
|
Juan Ferrer
|
84737a0bb9
|
#997 worker.summary, bugs fixed
|
2019-01-30 13:32:25 +01:00 |
|
Juan Ferrer
|
7893c784aa
|
#997 worker summary
|
2019-01-29 21:45:43 +01:00 |
|
Juan Ferrer
|
e553d63492
|
#996 worker.descriptor
|
2019-01-29 21:00:27 +01:00 |
|
Juan Ferrer
|
f47fe9c1cc
|
#998 worker.index, back tests fixed
|
2019-01-29 16:37:59 +01:00 |
|
Juan Ferrer
|
3e40c651af
|
#998 worker.index
|
2019-01-28 16:24:45 +01:00 |