verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
9,990 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

9990 Commits

Author SHA1 Message Date
Dani Herrero 4b2f709879 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-21 12:25:07 +02:00
Dani Herrero 490ff51fa6 bug fixed in address edit with watcher 2017-09-21 12:24:14 +02:00
Vicente Falco 092696514f merge 2017-09-21 12:18:29 +02:00
Vicente Falco 35ce85e3fc docker DB 2017-09-21 12:17:48 +02:00
Carlos 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
Carlos f716721836 info tag for emails updated and html and es.json files addapted. 2017-09-21 10:26:46 +02:00
Dani Herrero 922ae5c848 billing data with acls 2017-09-21 10:23:51 +02:00
Dani Herrero a222a7a8d1 tooltip translate refactor 2017-09-21 09:33:02 +02:00
Dani Herrero 32d816ba60 translate in info tag 2017-09-21 09:06:51 +02:00
Carlos 1e494ec08b refactor plus front-end unit repairs 2017-09-21 08:48:25 +02:00
Dani Herrero aa4bfb4f51 change password permission 2017-09-21 07:53:23 +02:00
Carlos 205f6b2c54 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 
* 'dev' of https://git.verdnatura.es/salix:
  autocomplete-v2 renamed
  removed autocomplete folder
  quitado autocomplete anterior
  autocomplete con seleccion multiple
  transclude funcionando
  autocomplete recatoring 80%
  refactoring 30%
 2017-09-20 15:07:30 +02:00
Carlos 76b0b955cf fixed ESLint errores for the commited files. 2017-09-20 15:06:38 +02:00
Dani Herrero f6399596ce autocomplete-v2 renamed 2017-09-20 14:25:43 +02:00
Dani Herrero 4b1e88cc1c removed autocomplete folder 2017-09-20 14:23:53 +02:00
Dani Herrero d8ba5ecdcb Merge branch 'autocomplete-v2' into dev 2017-09-20 14:10:16 +02:00
Carlos 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
Dani Herrero 07f8309d36 quitado autocomplete anterior 2017-09-20 13:56:47 +02:00
Dani Herrero 1dad2147ca autocomplete con seleccion multiple 2017-09-20 13:52:53 +02:00
Carlos e20dd82928 repaired ESLint to work everywhere, plus refactor on all package.json's that included ESLint dependencies. 2017-09-20 13:15:12 +02:00
Vicente Falco 6c3ac042f1 CreateUserProfile: save first email on account table and all emails on client table 2017-09-20 12:15:38 +02:00
Dani Herrero d81d36217a transclude funcionando 2017-09-20 11:50:53 +02:00
Carlos e76f1d74f9 corrected small typo at datePicker.js 2017-09-19 15:03:39 +02:00
Carlos 2e5989cc7f removed console.log from filter.js 2017-09-19 14:36:48 +02:00
Carlos 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
Dani Herrero e525f1da30 Merge branch 'dev' into autocomplete-v2 2017-09-19 07:17:56 +02:00
Carlos 26a1d7fb29 fixed url() problems for e2e create clients path, plus extension implementation. 2017-09-18 17:28:47 +02:00
Carlos 59a533473c removed ms wait to check selector waits on windows 2017-09-18 16:01:52 +02:00
Carlos e31e2269f8 waitForSnackbarReset extension and e2e client path refactor 2017-09-18 13:25:48 +02:00
Carlos c8323a97c3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 
* 'dev' of https://git.verdnatura.es/salix:
  boolean return method getRoleCustomer
 2017-09-18 13:03:45 +02:00
Carlos 937cacd44d e2e client path non search results test plus extension for rearch results management 2017-09-18 13:03:15 +02:00
Vicente Falco 93568237f0 boolean return method getRoleCustomer 2017-09-18 11:52:03 +02:00
Carlos 12d7f0776c renamed create client path for e2e and README.md update 2017-09-18 10:35:49 +02:00
Carlos aed228e2e2 small refactor on e2e clients path 2017-09-18 09:38:50 +02:00
Vicente Falco 7f6e9fc617 Service gets if a client has got a Role customer - 
getRoleCustomer
 2017-09-18 07:39:06 +02:00
Carlos 0a900fbb80 client path tests catch errores and user creatin inactive test. now waiting for fixtures to enable. 2017-09-17 20:43:55 +02:00
Carlos 639c7e901e e2e client path tests, full user creation pending 2017-09-17 20:01:15 +02:00
Vicente Falco 8597dab1de jasmine DEFAULT TIMEOUT 2017-09-17 19:09:20 +02:00
Carlos d51351a2d7 nightmare will wait 3seconds uppon a change for safe navigation on windows until docker database is implemented. 2017-09-17 18:36:44 +02:00
Carlos 725815678d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 
* 'dev' of https://git.verdnatura.es/salix:
  install packages on folders with file package.json - gulp install
 2017-09-17 18:11:07 +02:00
Carlos e68c05d9f1 clients path refactor, intermitent errors should be fixed pending tests on windows environment. 2017-09-17 18:09:59 +02:00
Vicente Falco ba8f0aaf80 install packages on folders with file package.json - gulp install 2017-09-17 17:42:01 +02:00
Vicente Falco 700be7c5a6 WDS Error windows 2017-09-17 15:09:10 +02:00
Carlos 0876a38104 client path small refactor for login helper 2017-09-15 15:36:03 +02:00
Carlos 2721b87e57 client path e2e tests refactor 2017-09-15 12:24:37 +02:00
Dani Herrero 6651f70e07 autocomplete recatoring 80% 2017-09-14 13:40:55 +02:00
Carlos bd20f76274 test for autocomplete client side 2017-09-14 09:22:49 +02:00
Vicente Falco 116714c370 Ejecutar test via npm test command 2017-09-14 09:15:53 +02:00
Dani Herrero f9b3657440 refactoring 30% 2017-09-13 14:59:58 +02:00
Dani Herrero 99155e09fb vn-title bug fixed 2017-09-13 13:34:57 +02:00