Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
 Joan Sanchez
|
4645e75f17
|
check fdescribe removed
gitea/salix/dev This commit looks good
Details
|
2019-02-19 07:05:39 +01:00 |
|
Joan Sanchez
|
79e8c1b19a
|
checkbox front unit test
gitea/salix/dev This commit looks good
Details
|
2019-02-19 07:04:56 +01:00 |
Gerard
|
e85c346f45
|
#1102 scope en el modelo company
gitea/salix/dev This commit looks good
Details
|
2019-02-18 14:46:25 +01:00 |
|
Gerard
|
3101020220
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-18 14:40:55 +01:00 |
|
Gerard
|
cc69099b37
|
#1102 scope en el modelo company
|
2019-02-18 14:40:50 +01:00 |
|
Joan Sanchez
|
75053618a2
|
zoneLocation order
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:39:48 +01:00 |
|
Joan Sanchez
|
813d7368f3
|
fixed zoneLocation order
|
2019-02-18 13:37:36 +01:00 |
 Javi Gallego
|
da4d961c8b
|
Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures
Details
|
2019-02-18 13:35:33 +01:00 |
|
Javi Gallego
|
a3e69d604a
|
getAvailable aislado
|
2019-02-18 13:31:57 +01:00 |
|
Joan Sanchez
|
0ea161ff19
|
fixed zoneLocation search
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:23:24 +01:00 |
|
Gerard
|
eccd83aac0
|
nodemon now watches json changes
gitea/salix/dev This commit looks good
Details
|
2019-02-18 12:55:22 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Gerard
|
cb78a6da65
|
not being able to translate titles fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-18 11:35:16 +01:00 |
|
Gerard
|
f5759f131b
|
#1145 item diary no va a la linea actual
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-18 09:50:46 +01:00 |
|
Gerard
|
13473e7bec
|
#1145 item diary no va a la linea actual
|
2019-02-18 09:50:09 +01:00 |
|
Joan Sanchez
|
87fff4e338
|
fixed intermediate on non triple-state checkbox
gitea/salix/dev This commit looks good
Details
|
2019-02-18 09:14:39 +01:00 |
 Juan Ferrer
|
7e6cb91c89
|
Merge branch 'dev' of juan/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-02-18 07:57:25 +00:00 |
|
Juan Ferrer
|
89468bf375
|
Merge remote-tracking branch 'upstream/dev' into dev
gitea/salix/PR-9 Build queued...
Details
gitea/salix/test This commit looks good
Details
|
2019-02-18 08:56:16 +01:00 |
|
Juan Ferrer
|
a1364c653c
|
Jenkinsfile fixes
|
2019-02-18 08:55:58 +01:00 |
|
Juan Ferrer
|
2fc36e1f40
|
Merge branch 'dev' of juan/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-02-18 07:49:44 +00:00 |
|
Juan Ferrer
|
f56043e786
|
Jenkinsfile fixes
gitea/salix/PR-8 This commit looks good
Details
|
2019-02-18 08:38:25 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Joan Sanchez
|
3b0d003322
|
treeview refactor & zone #1140
gitea/salix/dev This commit looks good
Details
|
2019-02-18 08:37:26 +01:00 |
|
Javi Gallego
|
58706b8694
|
backPreparado
gitea/salix/jgallego There was a failure building this commit
Details
|
2019-02-18 07:57:15 +01:00 |
|
Juan Ferrer
|
56bc860fa0
|
Merge branch 'dev' of juan/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-17 18:50:00 +00:00 |
|
Juan Ferrer
|
98a62bed2d
|
Jenkinsfile fixes
gitea/salix/PR-6 Build started...
Details
gitea/salix/PR-7 This commit has test failures
Details
|
2019-02-17 19:30:35 +01:00 |
|
Juan Ferrer
|
51a701c7f4
|
Jenkins file fixes
gitea/salix/PR-6 There was a failure building this commit
Details
|
2019-02-17 19:29:02 +01:00 |
|
Juan Ferrer
|
041a423102
|
Merge branch 'dev' of juan/salix into dev
|
2019-02-17 17:59:48 +00:00 |
|
Juan Ferrer
|
3a56044634
|
Jenkinsfile fixes
|
2019-02-17 18:35:29 +01:00 |
|
Carlos Jimenez Ruiz
|
4186fbacb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-16 17:15:03 +01:00 |
|
Juan Ferrer
|
9346c7adc3
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2019-02-15 22:08:44 +01:00 |
|
Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
|
Gerard
|
cb9e2284eb
|
styles, imports of titles and traductions added
|
2019-02-15 17:30:22 +01:00 |
|
Javi Gallego
|
2b4f5984cc
|
principio 1146
|
2019-02-15 16:04:24 +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 |
|
Juan Ferrer
|
4b027f015d
|
Pull request: test 1
|
2019-02-15 15:23:39 +01:00 |
|
Javi Gallego
|
00c7f28baf
|
Merge branch 'jgallego' of https://gitea.verdnatura.es/verdnatura/salix into jgallego
|
2019-02-15 14:36:50 +01:00 |
|
Javi Gallego
|
b81b8e18ed
|
$color-font-link
|
2019-02-15 14:29:47 +01:00 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
a806a26042
|
Merge branch 'jgallego' into dev
|
2019-02-15 13:42:42 +01:00 |
|
Juan Ferrer
|
70e807e965
|
Merge branch 'dev' of juan/salix into dev
|
2019-02-15 12:36:58 +00:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +01:00 |
|
Juan Ferrer
|
588583d63d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:33:07 +01:00 |
|
Juan Ferrer
|
9a8f418c7b
|
Jenkinsfile fixes
|
2019-02-15 13:32:07 +01:00 |
|
Joan Sanchez
|
08c252fb9b
|
updated check component
|
2019-02-15 13:31:14 +01:00 |
|
Javi Gallego
|
32cc39ad00
|
order.json regularizados campos addressFk, agencyModeFk
|
2019-02-15 13:26:49 +01:00 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
d6a8cd68d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:19:21 +01:00 |
|
Javi Gallego
|
8bea3afbfb
|
karma reparado
|
2019-02-15 13:13:23 +01:00 |