Commit Graph

25531 Commits

Author SHA1 Message Date
Juan Ferrer Toribio ca7e299fbc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-03 20:14:52 +01:00
Juan Ferrer Toribio 597299b1c5 Autogenerated Nginx config and docker compose 2018-02-03 20:14:44 +01:00
Carlos Jimenez 48f6f5a18d successfully moved all specs from services/client/c../m../client alongside their respective js files 2018-02-02 16:24:22 +01:00
Carlos Jimenez 7a04327655 removed login warm up to speed up about 20 secs the e2e executiom 2018-02-02 13:04:59 +01:00
Carlos Jimenez 099fbc1c9f gulpfile updated to restart enginx upon services task 2018-02-02 12:38:34 +01:00
Carlos Jimenez 249052cc12 item descriptor shows max 4 tags 2018-02-02 12:32:44 +01:00
Javi Gallego ac8db83582 README fixes, bugfixes for windows 2018-02-02 09:51:38 +01:00
Carlos Jimenez a7f4736c12 updated files accordantly 2018-02-01 16:01:49 +01:00
Carlos Jimenez c94fe12f91 README update plus package.json nodemon to dev dependencies 2018-02-01 15:48:19 +01:00
Carlos Jimenez f434de30c3 removed env variable from services tests 2018-02-01 15:00:42 +01:00
Daniel Herrero f78f1413bd merge conflicts 2018-02-01 14:34:50 +01:00
Daniel Herrero 81c234f26f gulp error fixed 2018-02-01 14:28:28 +01:00
Daniel Herrero 51cc783521 side front address observations 2018-02-01 13:28:45 +01:00
Juan Ferrer Toribio aae0cd9128 Merge 2018-02-01 12:55:06 +01:00
Juan Ferrer Toribio 57479aaf76 Bug fixes 2018-02-01 12:52:58 +01:00
Carlos Jimenez 4a2418eb7c removed unused code from the compile method on focus front unit tests 2018-02-01 11:28:41 +01:00
Carlos Jimenez 03116ed595 item descriptor now shows itemTags ordered by priority 2018-02-01 10:05:20 +01:00
Juan Ferrer Toribio b5e5b5bd6b Merge 2018-02-01 08:50:26 +01:00
Juan Ferrer Toribio 52db3bbf2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-01 08:49:10 +01:00
Juan Ferrer Toribio 86830bc2d2 Gulp file reorganized 2018-02-01 08:48:54 +01:00
SAMBA\bernat 94693c3a7e structure dblocal syncronize with produccion 2018-02-01 08:46:13 +01:00
Carlos Jimenez b01b333481 inserts sql updated for items 2018-02-01 08:32:48 +01:00
Juan Ferrer Toribio 87b3ac995d Development environment now points to local database by default 2018-01-31 14:56:55 +01:00
Juan Ferrer Toribio 9090c56c64 Backend tests fixed 2018-01-31 13:40:26 +01:00
Juan Ferrer Toribio cba0645f92 Merge with dev 2018-01-31 12:19:34 +01:00
Juan Ferrer Toribio 3d6f9fbbca Backend tests refactor, bug fixes 2018-01-31 12:17:17 +01:00
Carlos Jimenez cd027a3e12 refactor to avoid using import on backend testing env 2018-01-31 12:02:35 +01:00
Carlos Jimenez 215ae09b70 refactor to remove import from backend testing in order to use require 2018-01-31 11:15:12 +01:00
Juan Ferrer Toribio 109f04c517 Merge 2018-01-30 16:34:32 +01:00
Carlos Jimenez fbc327302b fixed karma config to chrome browser 2018-01-30 15:51:40 +01:00
Carlos Jimenez 801926bd27 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-30 15:49:26 +01:00
Carlos Jimenez d700d3a905 routes backend unit test completed 2018-01-30 15:49:22 +01:00
Daniel Herrero 9218aaf059 merge conflicts 2018-01-30 14:52:28 +01:00
Juan Ferrer Toribio 7d7d179bdd Fontend tests fixed 2018-01-30 14:48:21 +01:00
Daniel Herrero 90fab7b01a address observations, list and view edit (TODO save) 2018-01-30 14:47:47 +01:00
Daniel Herrero 7eab262175 CRUD item basic data finish 2018-01-30 08:59:43 +01:00
Juan Ferrer Toribio 9d92b9def7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-30 08:59:12 +01:00
Carlos Jimenez 7c36daf496 backend unit test for routes logout 2018-01-29 21:20:04 +01:00
Juan Ferrer Toribio f688090cba i18n on backend, improved backend error handling, redundant model-config removed 2018-01-29 19:57:00 +01:00
Carlos Jimenez 09f244bc62 backend unit test for the try to define loginUrl 2018-01-29 14:39:08 +01:00
Carlos Jimenez ea3988351c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-29 14:28:47 +01:00
Carlos Jimenez ba6a1f0f16 backend unit test for routes login 2018-01-29 14:28:31 +01:00
Juan Ferrer Toribio 97adf0a39e README and LICENSE updated 2018-01-29 13:49:59 +01:00
Juan Ferrer Toribio f4a790f87c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-29 12:38:08 +01:00
Juan Ferrer Toribio a3188b204f Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved 2018-01-29 12:37:54 +01:00
SAMBA\bernat 71d587764c update fixtures 2018-01-26 14:12:41 +01:00
Carlos Jimenez 0e88c2c4e7 renived private method tests and implemented HeadLessChrome on Karma and removed Firefox as browser 2018-01-26 12:13:39 +01:00
Carlos Jimenez 6dba8c7a40 salesperson back end unit tests plus small refactor on addresses, employee and filter specs 2018-01-26 11:23:53 +01:00
Carlos Jimenez 8dafd8c3b0 roles backend unit tests plus typos corrected on card and filer specs 2018-01-26 09:00:16 +01:00
Carlos Jimenez 426c747fec added explanation to nightmareModifiers 2018-01-26 08:37:18 +01:00