5a1aca198b
localizador rutas maquetacion 90%
2017-11-07 11:22:33 +01:00
ed3ee81292
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-11-07 10:00:32 +01:00
7f3df756c8
continuacion con la maquetacion del localizador de rutas
2017-11-07 09:59:49 +01:00
8bb43edcfc
route: delete gesdoc
2017-11-07 08:47:12 +01:00
fd1c174453
merge
2017-11-03 07:05:05 +01:00
9c1086bd4c
merge
2017-11-03 07:04:38 +01:00
ae2ecb6d73
tabla localizador de rutas maquetada
2017-11-02 14:57:36 +01:00
f0b4e1ff71
structure module locator
2017-11-02 14:10:28 +01:00
4f840c71e3
new icon-menu
2017-11-02 13:27:35 +01:00
74e2b2b04d
merge
2017-11-02 13:09:59 +01:00
93661fe8e3
new module locator
2017-11-02 11:13:20 +01:00
3d9c46f08e
enlaces pp en modulos cliente y rutas
2017-11-02 09:58:28 +01:00
1d1f377a18
error con checkboxes y su anchura
2017-11-02 08:46:09 +01:00
83d63547ff
sprint3 pantallas de rutas
2017-11-02 08:18:37 +01:00
76b5903770
refactor dataPicker
2017-10-31 10:40:12 +01:00
ee7c4e214f
bug fixed in dataPicker
2017-10-31 09:44:24 +01:00
e04cda0f35
service Production: bugs
2017-10-31 09:26:11 +01:00
bec05a1925
route basic data structure
2017-10-31 08:42:43 +01:00
2be39c0deb
setting up spec files for the next directive to test
2017-10-24 08:34:50 +02:00
0a8a682376
finished client side unit test for directive id
2017-10-24 08:08:58 +02:00
f6c1f5f137
lient side unit test for id directive
2017-10-24 07:57:25 +02:00
c88023182a
client side unit test for vnFocus directive tests
2017-10-23 16:25:47 +02:00
4e1d2db3cb
unit test for dialog directive plus small refactors
2017-10-23 10:47:56 +02:00
abb59189ff
aclService mock removed as dependencies were corrected on previous commit: 3badf2a
2017-10-20 11:18:44 +02:00
8bb2536f90
multi-check unit test repairs
2017-10-20 10:42:55 +02:00
3badf2a48a
refactor to move aclService from salix to Core
2017-10-20 08:39:30 +02:00
a530c67336
client side unit test for acl directive plus small refactor
2017-10-19 19:11:49 +02:00
e8473d56fb
correction of expect at acl directive unit test
2017-10-19 15:41:58 +02:00
94bfe50818
client side unit test for acl directive, comment added about directive behavior.
2017-10-19 15:40:00 +02:00
82b75d3b70
bugFixed multiCheck onBlur action
2017-10-19 14:13:28 +02:00
d72904a69e
Bug fixed in multiCheck
2017-10-19 12:31:55 +02:00
83d262ec32
agencyService changes to agencyMode
2017-10-19 09:21:34 +02:00
b5d90dfbc6
micro refactor and deletion of unused file.
2017-10-18 14:33:34 +02:00
3d52031dc2
cambios en validacion de credito de cliente
2017-10-18 12:51:33 +02:00
85ec628ae6
refactor to load controller on the beforeEach in all spec files for client side unit tests
2017-10-17 14:24:40 +02:00
4cfc6f23d9
small test added to the watcher
2017-10-17 12:33:37 +02:00
5073527c93
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
facke active drivers rest created
parse vars in filer routes
Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 12:29:59 +02:00
56182fb4b1
finished client side unit test for watcher
2017-10-17 12:27:32 +02:00
a366ef1fc1
facke active drivers rest created
2017-10-17 12:22:19 +02:00
5e1be3bc53
client side unit test for vnWatcher until submit[controller.save] plus small refactor for other files plus deletion of unused file
2017-10-16 15:20:40 +02:00
496fd22b60
Client side unit test for watcher until $onDestroy
2017-10-13 18:26:38 +02:00
d7668c278d
Client side unit tests for spinner
2017-10-13 17:35:47 +02:00
bcec5326f2
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-13 16:54:12 +02:00
c1ea17a377
client side unit test for multi-check
2017-10-13 16:43:11 +02:00
91b9c0bcf9
client side unit test for multi check until switchChecks()
2017-10-13 16:26:47 +02:00
8fc14348d7
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-13 16:23:08 +02:00
4267b5fe0a
Eliminando código redundante v2
2017-10-13 16:22:45 +02:00
7cf57d05f1
Client side unit test for grid-header
2017-10-13 10:45:06 +02:00
311d80d902
Client side unit test for drop-down
2017-10-13 10:23:28 +02:00
f24e16b81d
moved model agency
2017-10-11 15:00:18 +02:00
80bbd9e5d4
bug fixed in datePicker
2017-10-11 14:21:32 +02:00
e52b31ceb3
service validations moved into generic folder
2017-10-11 14:10:51 +02:00
4563ee1b58
removed console.log
2017-10-11 13:25:03 +02:00
a62285ff9e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
zone model and rest api
module routes: front dev 80%
filtro de rutas con paginación
routes change model and first look
Login sin url de redirección
2017-10-11 12:57:26 +02:00
3e44e927e8
client side unit test for dropdown until setScrollPosition
2017-10-11 12:57:13 +02:00
4dae59aa09
zone model and rest api
2017-10-11 12:47:02 +02:00
cf36d7d6be
module routes: front dev 80%
2017-10-11 12:09:22 +02:00
911fbb2f8b
filtro de rutas con paginación
2017-10-11 09:18:26 +02:00
eeda5b45fd
routes change model and first look
2017-10-10 15:01:10 +02:00
1bc3a0bdd7
autocomplete bug fixed in loadMore button
2017-10-10 12:56:03 +02:00
bf903d8b1e
textfield: icons position changed
2017-10-10 12:37:52 +02:00
96235a6752
route service models
2017-10-10 11:14:35 +02:00
c341009489
CLient side unit test for dialog onKeypress()
2017-10-09 14:30:23 +02:00
aec32f5e4a
client side unit test for dialog onBackgroundMouseDown()
2017-10-06 16:30:51 +02:00
022450000e
micro-refactor on spec file
2017-10-06 15:36:25 +02:00
e6acc57fae
client side unit test for dialog onButtonClick()
2017-10-06 15:33:21 +02:00
1301fefe68
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
new micro-service route: need reinstall all dependencies
estructure for new module route
bug fixed autocomplete and width dropdown
2017-10-05 14:29:11 +02:00
de9d9e53e2
client side unit test for dialog
2017-10-05 14:28:57 +02:00
4d487e7980
estructure for new module route
2017-10-05 12:38:28 +02:00
0c84722755
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-05 11:04:30 +02:00
562ffed388
bug fixed autocomplete and width dropdown
2017-10-05 11:04:22 +02:00
231bd9f813
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
watcher: removed unnecessary injection
removed unnecessary function in equals.js
watcher renamed properties
refactor watcher
2017-10-05 09:58:28 +02:00
28909da94e
client side unit test for column-header
2017-10-05 09:58:15 +02:00
5b100e502c
watcher: removed unnecessary injection
2017-10-05 09:53:40 +02:00
c4d6fd91db
removed unnecessary function in equals.js
2017-10-05 09:51:27 +02:00
e2312d954d
watcher renamed properties
2017-10-05 09:31:28 +02:00
8df67ad95e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-05 09:21:24 +02:00
601cf6db25
refactor watcher
2017-10-05 09:20:40 +02:00
485ef528b7
correct eslint errors in the commited files
2017-10-05 08:59:16 +02:00
1b47d85828
client side unit test for textfield
2017-10-04 16:02:53 +02:00
dd004fdc89
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 13:32:44 +02:00
0925451364
spread equivalent tax in all addresses
2017-10-04 13:32:26 +02:00
2402469f39
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
bug fixed modified data object
2017-10-04 13:28:02 +02:00
92e1754571
client unit test for paging plus rly small refactors
2017-10-04 13:27:39 +02:00
245112438e
bug fixed modified data object
2017-10-04 10:54:29 +02:00
9f7170f773
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
validation client credit - refact
validate client credit
AutoLoad items with "scroll" (1st version)
2017-10-04 08:47:28 +02:00
946d7f8824
Autocomplete spec updated, icon-menu spec completed and small refactors in dialog, drop-down and icon-menu
2017-10-04 08:47:16 +02:00
2aed5d088c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-04 08:18:49 +02:00
c39b29128c
client side unit test for datePicker
2017-10-03 14:41:35 +02:00
2db36a56bb
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 12:10:43 +02:00
bc8d319714
AutoLoad items with "scroll" (1st version)
2017-10-03 12:10:30 +02:00
73964ac387
removed unsed files and commented code for deprecated date-picker.js
2017-10-03 11:54:09 +02:00
d121517569
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
dropdown: new style in -no more results-
2017-10-03 11:33:54 +02:00
57b03790a3
Autocomplete client side unit tests finished
2017-10-03 11:32:25 +02:00
5ef97c209d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 09:25:41 +02:00
1f5f0a0fda
dropdown: new style in -no more results-
2017-10-03 09:25:25 +02:00
7d1bc60112
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
bug fixed on LoadMore action in autocomplete
2017-10-03 09:19:02 +02:00
106d7d8364
autocomplete client side unit test for findItems() with multiple
2017-10-03 09:18:12 +02:00
4e309b67f0
bug fixed on LoadMore action in autocomplete
2017-10-03 09:16:02 +02:00
ff6801c8e8
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-10-03 07:10:52 +02:00
9afb992225
autocomplete changes on initialData
2017-10-03 07:10:37 +02:00
Joan Sanchez
aef9659798
Mailer: Autentificación token por ruta. Fix creditClassification
2017-10-02 11:19:55 +02:00
Javi Gallego
19e7e0d76b
cambio de enabled y default por isEnabled y isDefaultAddress
2017-09-29 14:41:30 +02:00
1662c9d241
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 14:34:40 +02:00
ecf88f6b66
new address list
2017-09-28 14:34:18 +02:00
0742a4e098
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
get address return province data
sales person formated
getRoleCustomer return object not array of object
Token authenticate, solunion notification
2017-09-28 12:38:05 +02:00
86fdb010ae
Autocomplete client side unit test for findItems
2017-09-28 12:37:45 +02:00
70e4b22e8a
get address return province data
2017-09-28 11:29:01 +02:00
1d47bf58f1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-28 09:14:31 +02:00
62cc0c3c9e
sales person formated
2017-09-28 09:13:42 +02:00
895b3435c4
getRoleCustomer return object not array of object
2017-09-28 08:41:45 +02:00
720cf89204
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
moved textfield styles
textfield: clear icon dinamic display
2017-09-27 14:10:42 +02:00
66c80fd5bd
small refactor in autocomplete.js and some more client side unit test for field() > multiField() and displayValue()
2017-09-27 14:10:03 +02:00
35454c5c53
moved textfield styles
2017-09-27 12:44:33 +02:00
9d41a70416
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 12:27:38 +02:00
6aed24a02c
textfield: clear icon dinamic display
2017-09-27 12:27:18 +02:00
5dc0608f86
error corrected
2017-09-27 11:58:35 +02:00
ef7ee12373
client side unit test for autocomplete field() query functionality
2017-09-27 11:51:25 +02:00
7b391ef9a1
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
[finish] active salesPerson service
2017-09-27 09:44:16 +02:00
9ae7898c19
client side unit test for autocomplete field() > setValue()
2017-09-27 09:42:59 +02:00
bc20725c6c
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-09-27 09:25:39 +02:00
fbd5fea126
[finish] active salesPerson service
2017-09-27 09:25:33 +02:00
959f09d272
more tests
2017-09-27 08:09:10 +02:00
0a17a59f2d
client unit tests for autocomplete field()
2017-09-26 18:21:11 +02:00
3a666ef764
client unit test for autocomplete displayValue(), some functionality remains wild i.e. item.checked = false;
2017-09-26 14:10:55 +02:00
b41f5a3996
unit tests for autocompelete showDropDown plus small correction in other two files.
2017-09-26 10:26:21 +02:00
Javi Gallego
9b76d3d004
validaciones custom se bajan al cliente solo si son isExportable
2017-09-25 17:39:51 +02:00
235cc2d8f6
refactoring autocomplete: input readonly and autofucos on search input
2017-09-21 13:10:30 +02:00
490ff51fa6
bug fixed in address edit with watcher
2017-09-21 12:24:14 +02:00
ec4adc7552
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
billing data with acls
2017-09-21 10:27:10 +02:00
f716721836
info tag for emails updated and html and es.json files addapted.
2017-09-21 10:26:46 +02:00
922ae5c848
billing data with acls
2017-09-21 10:23:51 +02:00
a222a7a8d1
tooltip translate refactor
2017-09-21 09:33:02 +02:00
32d816ba60
translate in info tag
2017-09-21 09:06:51 +02:00
1e494ec08b
refactor plus front-end unit repairs
2017-09-21 08:48:25 +02:00
aa4bfb4f51
change password permission
2017-09-21 07:53:23 +02:00
f6399596ce
autocomplete-v2 renamed
2017-09-20 14:25:43 +02:00
4b1e88cc1c
removed autocomplete folder
2017-09-20 14:23:53 +02:00
d8ba5ecdcb
Merge branch 'autocomplete-v2' into dev
2017-09-20 14:10:16 +02:00
9ed9e13b54
jasmine ESLint plugging added to dev dependencies and refactor on all specs according to eslint rules.
2017-09-20 14:01:33 +02:00
07f8309d36
quitado autocomplete anterior
2017-09-20 13:56:47 +02:00
1dad2147ca
autocomplete con seleccion multiple
2017-09-20 13:52:53 +02:00
d81d36217a
transclude funcionando
2017-09-20 11:50:53 +02:00
e76f1d74f9
corrected small typo at datePicker.js
2017-09-19 15:03:39 +02:00
e8d24a52ef
basic-data.html info tag added, plus refactor on backend create.js and filter.js, plus spec commented until db docker implementation
2017-09-19 14:34:59 +02:00
e525f1da30
Merge branch 'dev' into autocomplete-v2
2017-09-19 07:17:56 +02:00
2721b87e57
client path e2e tests refactor
2017-09-15 12:24:37 +02:00
6651f70e07
autocomplete recatoring 80%
2017-09-14 13:40:55 +02:00
bd20f76274
test for autocomplete client side
2017-09-14 09:22:49 +02:00
f9b3657440
refactoring 30%
2017-09-13 14:59:58 +02:00
99155e09fb
vn-title bug fixed
2017-09-13 13:34:57 +02:00
e177b3698d
deleted unnecessary files
2017-09-13 11:43:00 +02:00
a200fb8143
textfield with info
2017-09-13 10:59:34 +02:00
2fd58af254
refactoring textfield finished
2017-09-13 09:45:42 +02:00
cccc0ade2b
refactoring textfield, validations pending
2017-09-12 15:02:14 +02:00
c90be5bd04
bug fixed: login
2017-09-12 12:45:29 +02:00
22f2d3e7f3
texfield refactor
2017-09-12 11:44:56 +02:00
8cad612a59
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
* 'dev' of https://git.verdnatura.es/salix :
textfield canvia las cadenas vacias a null
2017-09-08 09:53:56 +02:00
12270f21f9
changed tittes to english and small refactor on address-create spec
2017-09-08 09:53:37 +02:00
Javi Gallego
207addf2c3
textfield canvia las cadenas vacias a null
2017-09-07 19:35:17 +02:00
5570ec1c33
translation changes
2017-09-06 15:37:42 +02:00
eb1a844930
translation changes
2017-09-06 14:23:06 +02:00
fb41fbd963
refactor en fical-data.html
2017-09-06 12:49:36 +02:00
a9763e728c
refactor for backend create.js transaction and it's html error notification for account implemented
2017-09-06 09:56:36 +02:00
e2d1103607
tarea Añadir email y user al formulario de creación de clientes
2017-09-05 16:15:11 +02:00
e43e3211d0
descriptor unit test
2017-09-04 17:15:07 +02:00
352e68ed58
refactor in all client specs to next describes accordingly
2017-09-04 15:06:43 +02:00
6c13fce8a9
front client specs ES6 refactor
2017-09-04 14:39:58 +02:00
62c15fbafa
create client onSubmit callback tested
2017-09-04 12:46:19 +02:00
fa64931cc2
search-panel spec plus small refactor on it's js and html template.
2017-09-04 09:47:25 +02:00
a732d796e8
unit test for notes and index plus small refactor on notes.js
2017-09-01 13:03:02 +02:00
fd39993794
note-create unit test
2017-09-01 09:20:22 +02:00
abe576078e
removed unused httpBackend code
2017-09-01 08:49:22 +02:00
b63b92f5ef
refactor on various specs and commented malfuctioning code for future fixing.
2017-09-01 08:47:28 +02:00
3fd0a4f49d
create.js OnSubmit() unit test
2017-08-31 19:40:22 +02:00
c2e0a081e2
unit test for billing-data create and index
2017-08-31 19:15:17 +02:00
60c46b5fb7
small refactor on address-edit.spec.js
2017-08-31 08:55:17 +02:00
f813d052aa
unit test for address-create.js and address-edit.js
2017-08-31 08:53:17 +02:00
0461b3a429
vnClientCard unit test
2017-08-30 16:05:34 +02:00
aeaa417a4e
refactor at app.js to remove troublesome console.log()
2017-08-30 15:39:48 +02:00
1721509ce4
returnDialog() unit test
2017-08-30 15:30:49 +02:00
20d82cde50
checkPaymentChanges unit test
2017-08-30 12:30:48 +02:00
5e8f95dd65
Billing data copyData and submit unit tests plus small refactor at billing-data.js
2017-08-30 08:38:41 +02:00
d3600858ee
billing data copyData test
2017-08-29 15:14:18 +02:00
5bf59f4c25
commented failing spec and injected vnCore dependencies to cliente module.
2017-08-29 13:27:43 +02:00
1eb0c594be
unit test for web-access and bug fixes at watcher.js
2017-08-29 12:33:48 +02:00
46a69f3842
Merge remote-tracking branch 'origin/unit-tests' into dev
2017-08-25 11:49:26 +02:00
29dd3ef67c
removed unused code
2017-08-25 09:03:43 +02:00
fbb10cc2c0
unit testing environment
2017-08-25 08:42:53 +02:00
Javi Gallego
1743db2174
isEqualizated en Address
2017-08-22 14:27:09 +02:00
41182abb6e
cambio en watcher sustitucion de la función copy de Angular, para que ignore en las copias los campos vacios
2017-07-13 14:55:07 +02:00
45849e4daa
corregido CAU 2594 cambios en datos de facturación
2017-07-13 13:49:45 +02:00
1fc059273f
corregido error al destruir popover en searchBar
2017-07-13 13:32:23 +02:00
9fa608b11f
bug fixed filter in clients
2017-07-13 13:12:09 +02:00
7dfed60e7d
bug fixed in new datepicker and material design label effect
2017-07-13 11:03:22 +02:00
a06ac62b91
datepicker with timezone
2017-07-13 08:58:48 +02:00
3cf33fe48b
datepicker regex data with timezone
2017-07-13 08:55:39 +02:00
cd2560c8c6
bug fixed datepicker
2017-07-12 14:57:40 +02:00
f2c0dd3ab7
pruebas con date-picker y material
2017-07-12 14:32:15 +02:00
da3fddd9d2
estilos date-picker
2017-07-12 13:32:42 +02:00
17186c4035
nuevo date-picker
2017-07-12 13:32:25 +02:00
22829aa218
nuevos iconos de módulos
2017-07-11 14:28:53 +02:00
e22e9c7f13
refresh filter when clear model
2017-07-11 10:59:09 +02:00
b93c3f50e3
cambiando searchBar
2017-07-11 10:35:23 +02:00
2f6047d241
merge
2017-07-11 10:00:29 +02:00
81726e0a09
columnHeader change icon, style
2017-07-11 08:59:12 +02:00
2b7abef98f
corregido filtro principal
2017-07-06 14:46:22 +02:00
142cc920de
bug de multi seleccion corregido, cambio estilos
2017-07-06 14:21:55 +02:00
5929b8be32
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-06 13:04:51 +02:00
25ac346b2b
filtro principal y ajustes css
2017-07-06 12:58:50 +02:00
6f581e033a
Merge
2017-07-06 12:43:37 +02:00
0339fdaef1
cambio de hora funcionando
2017-07-06 11:05:26 +02:00
3c1847134b
Front acoplado al endpoint RouteFk
2017-07-06 09:02:27 +02:00
51ac5f5262
correccion ortográfica
2017-07-05 14:59:40 +02:00
81749e906d
refactorizacion popover
2017-07-05 14:41:10 +02:00
53af148def
corregido error popover
2017-07-05 14:01:03 +02:00
e4e01c4970
añadida id ruta en tabla, internacionalizacion y mejora de popover
2017-07-05 13:02:49 +02:00
ffe21e6947
corrección para popover anidados
2017-07-05 09:47:24 +02:00
76d9546355
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-07-03 14:50:52 +02:00
f670c0f4fd
Localizador: restablecer filtros, datePicker con formato 'es'
2017-07-03 14:50:48 +02:00
d5d5c3079a
corrección errores brocal
2017-07-03 14:23:53 +02:00
ba2d803f28
merge
2017-07-03 14:20:06 +02:00
9e6bd8522e
vies
2017-07-03 14:19:47 +02:00
06537bcf8d
filtro de trabajadores y llamada a validaciones opcional
2017-07-03 08:38:45 +02:00
461fc3c9a6
internacionalización por subir
2017-06-30 09:09:48 +02:00
3bb1eef43d
bug fixed in dropDown
2017-06-29 14:28:22 +02:00
6365a06cbb
Servicio mensaje de alerta modificado
2017-06-29 14:13:01 +02:00
8e177fcb2d
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 14:09:11 +02:00
372cfe718b
Localizador: warehouseFk por defecto
2017-06-29 14:09:04 +02:00
c5363155c4
send message
2017-06-29 14:08:57 +02:00
d8f4e0489e
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-29 13:56:56 +02:00
491ea3b796
dropDown with search and columHeader preview icon
2017-06-29 13:56:52 +02:00
2e7a225249
rawsql with promises
2017-06-29 11:48:57 +02:00
e9c0fa5cc9
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
...
# Conflicts:
# client/production/src/index/index.js
2017-06-29 09:52:45 +02:00
ddcec00c4f
change time
2017-06-29 09:48:00 +02:00
df614b4943
bugs fixed
2017-06-29 08:13:30 +02:00
5e2be42247
bugs fixed
2017-06-28 14:59:54 +02:00
5b5523e6b6
refactorización vnProductionTable
2017-06-28 14:53:26 +02:00
bfdd8ecd8e
Localizador: acciones separadas a nuevo componente vnProductionActions
2017-06-28 14:48:07 +02:00
6815ab2b3c
Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran)
2017-06-28 13:12:01 +02:00
7b38d2f188
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-28 08:57:37 +02:00
80121de6c3
change state
...
message send
change time
2017-06-28 08:57:33 +02:00
c2b351a777
Cambio de hora y refactorizacion del vnMultiCheck
2017-06-28 08:55:01 +02:00
b9704a2b91
corregido fallo en vnMultiCheck
2017-06-26 14:52:43 +02:00
4480431a08
estilos en vnMultiCheck
2017-06-26 14:41:08 +02:00
8b6e7fdc40
nuevo componente vnMultiCheck
2017-06-26 13:53:52 +02:00
fabe0cde7c
front: send message action
2017-06-26 10:52:22 +02:00
fcfef2c8b7
cambio en accion envio de mensaje
2017-06-26 09:39:21 +02:00
a96e3a57b6
corregido id ticket por ticketFk
2017-06-26 09:22:28 +02:00
6fd77dda74
cambio en filtros
2017-06-26 09:07:40 +02:00
17994a2cc5
internacionalizacion
2017-06-26 08:35:31 +02:00
c69ada432d
internacionalizacion (reverted from commit f419946766)
2017-06-26 08:32:57 +02:00
f419946766
internacionalizacion
2017-06-26 08:28:16 +02:00
09e805fd3a
Ordenación en campos correcto, autocomplete con clear
2017-06-22 15:04:02 +02:00
2bdbda6192
Localizador, cambio estlios, añadido paginador, order by
2017-06-22 12:03:01 +02:00
05b6c81a1b
dropDown con filtro
2017-06-21 13:16:37 +02:00
3796741371
primera versión del componente vnGridHeader para ordenación de tablas
2017-06-21 09:46:31 +02:00
d444980ab1
[En progreso] nuevo componente vnGridHeader para ordenación de tablas
2017-06-20 15:00:27 +02:00
ca19369093
Production: modal para mensajes, filtros búsqueda en front 100%
2017-06-20 09:27:49 +02:00
bcdc31d8d9
arreglo en autocomplete para admitir valores por defecto
2017-06-15 15:00:43 +02:00
1ca5e20494
añadido callBack cambio estados
2017-06-15 12:00:51 +02:00
5f2aa345ba
iconMenu arreglo de posicion del DropDown interno
2017-06-15 11:22:47 +02:00
f346e5e83c
arreglos en drop-down
2017-06-15 08:26:03 +02:00
9072b100f9
tooltip admite plantilla html, icon-menu forzado de posicion en dropDown
2017-06-15 07:45:01 +02:00
afff93cce6
Tooltip: admite html, Localizador: añadido icono con información adicional
2017-06-14 09:54:00 +02:00
7713d0bd6f
cambio estilos dropdown
2017-06-13 14:57:09 +02:00
e09f60a53a
Nuevos componentes: drop-down, icon-menu. Refactorización de icon e icon-button (pasados a componentes sin template manager)
2017-06-13 13:08:06 +02:00
f274335997
interfaz gráfica y correcciones varias
2017-06-08 14:57:23 +02:00
491241398a
localizador y tooltip arreglo estilos
2017-06-08 10:05:11 +02:00
3806e9e591
nueva directiva vn-tooltip
2017-06-08 09:29:03 +02:00
Joan Sanchez
984dc1e908
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
2017-06-07 15:29:11 +02:00
Joan Sanchez
73c5f5581f
Cambios en servicio mailer
2017-06-07 15:28:42 +02:00
6123278945
en progreso: interfaz gráfica
2017-06-07 15:03:12 +02:00
51a700b6ce
date-picker v1
2017-06-07 13:27:57 +02:00
5d789b0e71
Locales
2017-06-07 08:39:40 +02:00
9eaae2269b
client: localizador al 6%
2017-06-06 15:02:03 +02:00
9fcdb28d14
cambio en routes e interfaz localizador al 5%
2017-06-06 13:06:47 +02:00
609c984426
Loopback 3, errores solucionados, codigo reorganizado
2017-06-05 09:01:21 +02:00
b427361156
Loopback 3, Errores solucionados
2017-06-03 13:01:47 +02:00
8cd312e145
Errores solucionados
2017-06-02 15:39:16 +02:00
f9842000d3
Codigo gulp reorganizado, errores redirección solucionados
2017-06-02 15:23:19 +02:00
481a2219ce
Ruta desarrollo http://localhost:5000 , producción 80
2017-06-02 09:29:14 +02:00
bb91c026da
corregido error aviso cambio de método pago
2017-06-01 14:50:55 +02:00
b18c2c4966
Administración solo recargo equivalencia
...
Razón social único
Si no hay comercial, modificar los datos
2017-06-01 14:39:22 +02:00
a3dda662ae
ACLs, json configuracion y script SQL
2017-06-01 09:31:57 +02:00
67de66d6c5
mensajes de notificación enviada / error
2017-05-31 13:47:40 +02:00
981b763cd8
corrección errata ortográfica
2017-05-31 13:01:15 +02:00
96dd6de8a6
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-31 12:56:42 +02:00
b8287efdc2
kanban: asociar envío escrito con cambio de valor
2017-05-31 12:56:37 +02:00
c8424f98f4
paginación en clientes
...
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
39bb122ee1
renombrado de archivos parte 2
2017-05-31 10:28:39 +02:00
11c3b2de2d
renombrado de archivos parte 1
2017-05-31 09:46:05 +02:00
74a0eedb47
Añadidos ACLs del servicio client
2017-05-30 14:17:01 +02:00
87c38a0d89
creada factoria q retorna los modulos disponibles para el usuario, ACL
2017-05-30 09:54:35 +02:00
9ce12b2e53
nuevo home con acceso directo a los módulos
2017-05-30 09:06:11 +02:00
034bd93c99
Errores
2017-05-29 13:38:44 +02:00
025bd4224e
Errores en validación solucionados
2017-05-26 17:05:33 +02:00
0f4ac0edbb
Console.log eliminado
2017-05-26 14:42:01 +02:00
3d71f454a0
Errores en validación IBAN solucionados
2017-05-26 14:39:36 +02:00
d3ef7dde86
Error en validación length solucionado
2017-05-26 13:26:12 +02:00
a73b2eba0d
Errores solucionados
2017-05-26 13:14:47 +02:00
f6888af74a
Inicio de vn-home
2017-05-25 14:50:35 +02:00
571692f4ca
Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl
2017-05-25 14:23:19 +02:00
041be5ec93
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-25 12:52:49 +02:00
1482b842bd
Errores solucionados
2017-05-25 12:52:38 +02:00
Joan Sanchez
6f4e51cee6
Dependencia con uirouter actualizada
2017-05-25 12:34:03 +02:00
f12c66027b
Eliminada prueba de directiva vnAcl en último commit
2017-05-25 11:56:34 +02:00
fd3dd56542
Separado aclService en fichero propio
2017-05-25 11:52:53 +02:00
81f9de098d
ACLs , permisos a nivel de rutas, menu y componentes
2017-05-25 11:48:10 +02:00
345f2e55a5
vnAutocomplete: Acepta plantillas
2017-05-24 13:24:32 +02:00
bcd4cedbcd
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-23 16:12:47 +02:00
27073fe9d7
leftMenu : estado activo, Routes.json: nueva jerarquía de rutas
2017-05-23 14:36:54 +02:00
5b9fcf868a
401 redirecciona a login, vnAutocomplete: campos seleccionados
2017-05-23 14:05:26 +02:00
434002b308
separda la facturación en 2 modulos
2017-05-23 10:58:17 +02:00
bda48488fc
Client card, uso de mgCrud. Routes: añadido estado abstract
2017-05-23 09:20:21 +02:00
c1acd51d96
eliminado overflow hidden en vnTopbar
2017-05-22 13:31:24 +02:00
0b490f4105
Merge
2017-05-22 12:06:33 +02:00
c56368460c
uso de flex en topBar
2017-05-22 09:23:21 +02:00
9cce1e18a6
cabecera sin altura fija
2017-05-22 08:37:11 +02:00
04d5f9cf5d
eliminado vn-repeat
2017-05-22 08:23:51 +02:00
778ff9a5ec
intento de commit dani
2017-05-22 07:29:13 +02:00
5cfdd51cf4
Integración usuarios, errores solucionados
2017-05-21 18:36:07 +02:00
a06d1a579c
Ahora el token se envia en la cabecera HTTP
2017-05-19 08:25:49 +02:00
c4cb0906ad
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 17:35:51 +02:00
a2ac778c9a
Peticiones XHR con token
2017-05-18 17:35:07 +02:00
51c145158b
Error Guardar consignatario
2017-05-18 13:27:45 +02:00
b4d167bbb7
header.js
2017-05-18 11:54:39 +02:00
2aa7c9731d
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-18 08:18:53 +02:00
9d4acfc64f
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-17 21:23:54 +02:00
4eff9d451b
Autenticación por token
2017-05-17 21:23:47 +02:00
726bb73ca0
Todos heredan de MyModel
2017-05-17 14:58:23 +02:00
5f9160c172
ng-disabled vn-textfield
2017-05-17 14:04:02 +02:00
39f5f55714
merge
2017-05-17 13:18:20 +02:00
73f464cae5
merge
2017-05-17 13:15:16 +02:00
5db994e263
Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev
2017-05-17 12:14:17 +02:00
a7bfd5122a
Errores gulp solucionados
2017-05-17 12:07:42 +02:00
e4559c3959
Corrección error autocomplete
...
Separado meted activate
Separado meted addresses
2017-05-17 09:45:34 +02:00
ae3f9db948
VnAutocomplete ya no carga los datos cuando los datos se pueden bandera.
...
Creado el método card en client para listar el cliente con sus datos para el combo.
2017-05-17 08:19:03 +02:00
ba6b9c5a89
fiscal-data IBAN html
2017-05-16 13:44:25 +02:00
c4978b24fb
Errores eslint, scripts dev
2017-05-16 12:37:48 +02:00
60a3b049de
Campos renombrados
2017-05-12 15:21:37 +02:00
fbd3f4c623
Errores solucionados
2017-05-12 14:46:19 +02:00
88992438e2
Errores solucionados
2017-05-12 13:58:08 +02:00
ebb59d1eef
Errores en relaciones solucionados
2017-05-12 13:36:12 +02:00
8ce3325f06
Renombrado Chanel a ContactChannel
2017-05-11 14:19:43 +02:00
495e3b7c5e
creado el modelo Chanel.
...
Se puede seleccionar en el cliente.
2017-05-11 13:01:33 +02:00
0efdd3565e
Modelos loopback
2017-05-09 14:04:44 +02:00
0da217e9bc
Errores solucionados
2017-05-05 13:32:07 +02:00
f7ec186a77
Errores solucionados
2017-05-05 12:54:47 +02:00
ce2d7936af
Integración con MySQL, errores solucionados
2017-04-28 15:04:29 +02:00
1eb0fb9c8d
Merge
2017-03-14 13:11:34 +01:00
f1c5a45657
ACLs habilitadas
2017-03-14 13:08:55 +01:00
4bc1cf455b
notes: Crear
2017-03-10 11:18:16 +01:00
5e66bef50c
Clientes: Recordar campos busqueda avanzada
2017-03-10 07:19:43 +01:00
7059eadfc7
Correciones varias
2017-03-07 17:11:56 +01:00
398ede37d0
Correcciones varias
2017-03-07 13:01:24 +01:00
3a16f09494
bug validaciones, eslint en formato yml
2017-03-07 12:37:59 +01:00
2cb110feee
consignatario sin bind
2017-03-06 11:44:02 +01:00
8ed24880bc
Activate solucionado sus errores
2017-03-01 10:48:27 +01:00
2cc7d96dce
Eslint
2017-03-01 09:55:17 +01:00
807d1c4ab9
cambio aspa en textfield
...
modificado funcionario getModifiedData
el descriptor no envía datos al servidor
2017-02-28 12:07:16 +01:00
ded4e07ab7
Errores solucionados
2017-02-28 11:46:18 +01:00
c6ac5a8bdd
Errores solucionados
2017-02-24 13:03:23 +01:00
2210a53f31
dialog icon close
2017-02-22 12:42:41 +01:00
0f360db06e
mgCrud v2
2017-02-21 16:21:55 +01:00
bd486f830f
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-02-21 13:06:54 +01:00
a5fc7cb2e9
Estilo
2017-02-21 13:06:45 +01:00
33bc79cb70
icons locales
2017-02-21 12:49:41 +01:00
139cc770a5
Merge
2017-02-21 11:41:30 +01:00
c694f00644
mgCrud v1
2017-02-21 11:36:43 +01:00
1f5fe03b81
icon cuadrado
2017-02-16 08:16:59 +01:00
6302ad53b2
aspa en inputs
2017-02-15 14:56:44 +01:00
7313bda159
Cambios css
2017-02-09 14:44:04 +01:00
5cb3129495
Errores
2017-02-09 14:20:46 +01:00
72652454cf
popover menu clientes
2017-02-09 13:59:29 +01:00
c7150c2e7d
icon button cuadrado
2017-02-09 08:20:59 +01:00
8e437f9837
iconbutton cuadrado
2017-02-09 08:18:50 +01:00
72a9068c80
Errores solucionados
2017-02-08 17:37:54 +01:00
1ef62d3e98
vnFocus: warning en vez de error al fallar
2017-02-08 17:34:39 +01:00
efac73f4bc
mgCrud como modulo npm externo, vnFocus sobre botones
2017-02-08 17:28:23 +01:00
f4a5274a9a
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-02-08 15:57:57 +01:00
71cad27187
focus
2017-02-08 14:45:27 +01:00
e15a03e0ea
Errores solucionados
2017-02-08 12:47:10 +01:00
51c58d9a9b
mg-crud añadida, filtro phone
2017-02-08 12:45:55 +01:00
f5d9f1d679
Errores solucionados
2017-02-07 18:10:43 +01:00
38c75a6fcd
Errores solucionados
2017-02-07 17:52:11 +01:00
558ad8f393
Errores solucionados
2017-02-07 17:38:30 +01:00
a98580dc10
Errores solucionados
2017-02-07 17:02:17 +01:00
2c429de0a7
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-02-07 16:04:33 +01:00
e60084657e
vnFocus: Errores solucionados
2017-02-07 16:04:30 +01:00
a3fb0a3632
search-panel form con escape a falta de vn-focus
2017-02-07 14:53:30 +01:00
692a5b9d44
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-02-07 14:34:31 +01:00
64284b87c2
Core reorganizado
2017-02-07 14:34:26 +01:00
5a6682c773
paging clients
2017-02-07 13:24:04 +01:00
ec08e271f0
Errores solucionados, código preparado para mgCrud
2017-02-07 12:58:25 +01:00
9765b478ff
Errores solucionados, VnWatcher, fucionalidad añadida al dialog
2017-02-06 18:01:04 +01:00
fb132f0e5c
Error string.split solucionado
2017-02-03 12:18:08 +01:00
4c2c6ab7d0
CSS validaciones
2017-02-02 13:30:16 +01:00
9fb46b1ec0
Validaciones RC1
2017-02-02 13:17:30 +01:00
4f5a5ceee0
Validaciones con validator.js
2017-02-02 10:52:09 +01:00
a13526f3e7
Validaciones beta
2017-02-01 18:55:02 +01:00
9435e6f1e6
Errores solucionados
2017-02-01 10:05:15 +01:00
75437754ee
Estilo
2017-01-31 17:17:13 +01:00
35c372d12b
Errores solucionados
2017-01-31 16:09:46 +01:00
a2d56480f3
Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
2017-01-31 14:15:11 +01:00
abf6a6c142
Cargador modulos: modulo ng, validaciones, traducciones
2017-01-31 14:13:06 +01:00
Daniel Herrero
Vicente Falco
Carlos
Juan Ferrer Toribio
Joan Sanchez
Javi Gallego
nelo
dhan82
repository