Juan Picado @jotadeveloper eb2947213d Merge remote-tracking branch 'origin/master' into 4.x ... # Conflicts: # CHANGELOG.md # Dockerfile # package.json # src/lib/local-storage.js # src/lib/utils.js # test/unit/api/utils.spec.js		2018-12-06 23:04:42 +01:00
..
e2e	refactor: <Help /> component (#1118)	2018-11-16 22:29:56 +01:00
flow/plugins	feat: add support for profile cli command #392 (change password) (#1034)	2018-10-12 11:07:55 +02:00
functional	Merge remote-tracking branch 'origin/master' into 4.x	2018-12-06 23:04:42 +01:00
integration	refactor: add prettier for yaml files (#931)	2018-08-20 16:31:39 +02:00
lib	feat: add support for jwt on api (#896)	2018-08-21 08:05:34 +02:00
types	refactor: functional testing	2018-06-23 20:57:16 +02:00
unit	Merge remote-tracking branch 'origin/master' into 4.x	2018-12-06 23:04:42 +01:00
.eslintrc	build: update jest dependencies	2018-01-15 23:04:58 +00:00
jest.config.e2e.js	refactor: get rid of jest warnings	2018-06-27 08:52:52 +02:00
jest.config.functional.js	refactor: get rid of jest warnings	2018-06-27 08:52:52 +02:00
test.conf.js	refactor: add more constants	2018-06-26 06:15:09 +02:00