wodka 2276ca100f Merge branch 'master' into 2.20 ...

# Conflicts:
#	config/env/secure.js
#	package-lock.json
#	package.json
#	public/form_modules/forms/base/css/form.css
#	public/modules/forms/admin/config/i18n/french.js

2019-07-11 23:18:55 +02:00

..

config

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

controllers

fixed bugs with authentication

2018-09-11 14:09:17 -07:00

css

fixed editField bug

2017-10-18 17:18:18 -07:00

img

got server tests to pass

2017-11-02 11:14:25 -07:00

services

fixed duplicate views bug

2017-09-29 17:33:55 -07:00

tests/unit/controllers

removed empty authentication controller test

2017-11-02 11:37:33 -07:00

views

fixed all translations on frontend

2017-10-27 12:52:39 -07:00

core.client.module.js

first commit

2015-06-29 15:51:29 -07:00