 Javi Gallego
|
b6091775e5
|
Merge branch 'test' into dev
|
2018-03-06 12:48:22 +01:00 |
|
Javi Gallego
|
2a5efb04ae
|
angular inject minimify fixed factor VnPatch
|
2018-03-06 12:44:10 +01:00 |
Carlos Jimenez
|
42f1e1ec6f
|
#114 style
|
2018-03-06 12:08:25 +01:00 |
|
Carlos Jimenez
|
bc13abbe50
|
#114 mostrar current user en la top bar
|
2018-03-06 11:13:05 +01:00 |
 Joan Sanchez
|
24abbffba7
|
Client summary updated
|
2018-03-05 10:56:51 +01:00 |
|
Carlos Jimenez
|
bdc0e5ddc1
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-02 14:46:04 +01:00 |
Juan
|
8970662ff8
|
Redundant LDAP authentification test
|
2018-03-02 14:34:44 +01:00 |
|
Juan
|
d9a75acde0
|
LDAP authentification test
|
2018-03-02 14:31:15 +01:00 |
|
Carlos Jimenez
|
56a32343fd
|
style fix
|
2018-03-02 13:00:01 +01:00 |
|
Carlos Jimenez
|
b23617fcfb
|
item tag unit tests
|
2018-03-02 10:54:03 +01:00 |
|
Carlos Jimenez
|
f354a420bc
|
e2e item tags #121, plus item tags and item descriptor refactor #117
|
2018-03-02 10:51:01 +01:00 |
|
Juan
|
4a473f5c0f
|
Style fix
|
2018-03-01 23:49:01 +01:00 |
|
Juan
|
2c4fed4938
|
Style fixes
|
2018-03-01 23:41:27 +01:00 |
|
Juan
|
128c0d0ea3
|
vnCard style bug fixed
|
2018-03-01 23:38:14 +01:00 |
|
Juan
|
127c5e6c02
|
Style fixes
|
2018-03-01 21:54:18 +01:00 |
|
Juan
|
4b12411d6b
|
Style fixes
|
2018-03-01 21:18:43 +01:00 |
|
Juan
|
98388dde85
|
Image zoom bugs solved
|
2018-03-01 19:35:32 +01:00 |
|
Juan
|
e713ce01b4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 16:52:47 +01:00 |
|
Juan
|
c0f34bdd37
|
#142 & #143 - New descriptors header
|
2018-03-01 16:52:35 +01:00 |
Daniel Herrero
|
e683ee66c1
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 14:48:09 +01:00 |
|
Daniel Herrero
|
40e2b73e7c
|
tarea #105 in progress
|
2018-03-01 14:48:02 +01:00 |
|
Juan
|
9881c4e6f3
|
Merge
|
2018-03-01 14:04:33 +01:00 |
|
Juan
|
de145bd814
|
#128 - Client invoices form
|
2018-03-01 14:01:45 +01:00 |
|
Joan Sanchez
|
52503c1015
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 13:53:16 +01:00 |
|
Joan Sanchez
|
5dc7b0bb58
|
Client summary
|
2018-03-01 13:53:11 +01:00 |
|
Daniel Herrero
|
77b20ae764
|
clientIndex unit test fixed
|
2018-03-01 13:26:54 +01:00 |
|
Daniel Herrero
|
a78292ffb8
|
merge conflicts
|
2018-03-01 12:55:07 +01:00 |
|
Daniel Herrero
|
b92f8bdd43
|
tarea #105 esturcctura montada, falta rellenar datos
|
2018-03-01 12:51:35 +01:00 |
|
Javi Gallego
|
4ee4c07b19
|
Bug #125 Modelo item
|
2018-03-01 12:47:51 +01:00 |
|
Javi Gallego
|
c8eab7dc24
|
merge model-config
|
2018-03-01 11:57:33 +01:00 |
|
Javi Gallego
|
f3b00f4b47
|
entidad recovery con list, create y tests
|
2018-03-01 11:55:28 +01:00 |
|
Juan
|
3d4ff56888
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 11:36:48 +01:00 |
|
Daniel Herrero
|
465d210b51
|
bug 103 falcar cliente, acl condicionales
|
2018-03-01 10:54:02 +01:00 |
|
Juan
|
e6c44d74eb
|
Client invoices
|
2018-02-28 20:55:44 +01:00 |
|
Juan
|
b3037e2db9
|
Addresses E2E fixed
|
2018-02-28 13:07:58 +01:00 |
|
Juan
|
d9c54415cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-28 12:07:59 +01:00 |
|
Juan
|
a1ee22d153
|
#96 - Email validation errors fixed
|
2018-02-28 12:07:56 +01:00 |
|
Daniel Herrero
|
50fb035dd9
|
Bug #108 tooltip outsides
|
2018-02-28 09:12:48 +01:00 |
|
Juan
|
8ee649b9d0
|
Bug with empty value validations fixed
|
2018-02-27 22:50:14 +01:00 |
|
Carlos Jimenez
|
cf77d05156
|
fixed a merge conflit problem
|
2018-02-27 14:39:50 +01:00 |
|
Carlos Jimenez
|
cdfc2a6779
|
solved merge comflics with item tags
|
2018-02-27 13:40:33 +01:00 |
|
Carlos Jimenez
|
701e6f9976
|
completed task #144 tem tags bugs
|
2018-02-27 13:31:45 +01:00 |
|
Juan
|
688881fac4
|
Bug #97 - Show dash when no secured credit
|
2018-02-27 13:28:07 +01:00 |
|
Carlos Jimenez
|
33f19949d8
|
fixed item tags plus added watcher to niches
|
2018-02-27 12:32:47 +01:00 |
|
Daniel Herrero
|
5b928f3e04
|
itemtags i18n
|
2018-02-27 08:14:28 +01:00 |
|
Daniel Herrero
|
687b011f9a
|
minWatcher in tags
|
2018-02-27 08:09:51 +01:00 |
|
Daniel Herrero
|
e048402223
|
itemTag added priority
|
2018-02-27 07:54:41 +01:00 |
|
Carlos Jimenez
|
4e5cbef155
|
corrected error message when tags are repeated
|
2018-02-26 17:34:40 +01:00 |
|
Carlos Jimenez
|
456e63700f
|
removed unused code from item niche
|
2018-02-26 17:32:23 +01:00 |
|
Carlos Jimenez
|
c0106b11d2
|
fixed BUG in #123 item tags
|
2018-02-26 16:49:44 +01:00 |