6830 Commits

Author SHA1 Message Date
Alexandre BODIN
309be28183
Merge branch 'master' into patch-7 2019-12-09 10:06:52 +01:00
Alexandre BODIN
d6f93bb755
Merge branch 'master' into patch-1 2019-12-09 10:04:30 +01:00
Alexandre BODIN
3acd646701
Merge branch 'master' into improve-authorization-performance 2019-12-09 09:57:58 +01:00
Jørgensen
8087a4ada5
Merge branch 'master' into patch-7 2019-12-09 09:24:03 +01:00
Mathijs Nelemans
fcdbc4fbe3 Wrap tsvector attributes with coalesce before join
Fixed a bug where joining multiple tsvector attributes results in NULL
because one of the columns contains NULL. The expected behaviour is to
ignore that column instead, which is achieved by setting it to an empty
string
2019-12-07 12:40:05 +01:00
Sleva
52f5770b06 Updated ApolloServer configuration for introspection queries (#4660) 2019-12-06 12:35:06 +01:00
Jim LAURIE
7eaeda7974
Merge branch 'master' into master 2019-12-05 17:29:50 +01:00
Nevermoi
87f8f91b52
Update model.template
Wrong description of beforeSave and afterSave for model, since updating will not trigger these two hooks
2019-12-05 10:48:30 +08:00
Alexandre BODIN
88c530e133
Merge branch 'master' into @4625 2019-12-04 17:42:58 +01:00
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09:00
Jørgensen
5fd9677406
Use the id of entry to update relations
Fixes #4644
2019-12-03 12:59:33 +01:00
Alexandre BODIN
164c91dabb
Merge branch 'master' into identify-docker 2019-12-02 15:39:53 +01:00
Aurélien Georget
cf9bcc2337 Use environment variable instead of argument 2019-12-02 15:30:22 +01:00
Cowboy
b6ee350ac0 Fix no response when get user permission role with internal network 2019-12-02 14:58:57 +08:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Alexandre Bodin
1500b4f49a Valid plugin name 2019-12-01 23:05:58 +01:00
Aurélien Georget
773b89bc79 Add parameter to identify Docker projects 2019-11-29 18:10:32 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Alexandre Bodin
7a3b64016c Hotfix mongo aggregate policy verifications 2019-11-28 18:33:02 +01:00
Sulakin Vadim
c516051b3f
Merge branch 'master' into admin-russian-translation 2019-11-28 09:27:14 +03:00
Sulakin Vadim
9899480562
Merge branch 'master' into admin-russian-translation 2019-11-27 16:42:01 +03:00
Sulakin Vadim
c5d91ed514
Update ru.json 2019-11-27 16:41:39 +03:00
Jim LAURIE
3fe87ffcc7 Fix #4559 lowercase the email in the forgot password function 2019-11-26 16:03:06 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Sulakin Vadim
590bc5a78a
Merge branch 'master' into admin-russian-translation 2019-11-23 23:43:14 +03:00
Sulakin Vadim
378f842640 Update Russian translation for admin panel 2019-11-23 23:38:41 +03:00
Aurélien Georget
38f70a6e59 Send UUID while the admin is loaded 2019-11-22 18:37:54 +01:00
Long Nguyen
8bec836388 Add Vietnamese translation (#4414)
* Add Vietnamese translation

* chore: tweak vietnamese admin's translations

* chore: vietnamese placeholder

* feat: vietnamese content manager's translations

* chore: plugin documentation's vietnamese translations

* chore: plugin email's vietnamese translations

* chore: plugin upload's vietnamese translations

* chore: plugin users-permissions's vietnamese translations

* chore: register vietnamese to language switcher

* chore: add vietnamese welcome message
2019-11-20 11:58:35 +01:00
Aurélien GEORGET
f4069f4dce Send details about administrator in events (#4551) 2019-11-20 11:56:34 +01:00
Cowboy Ho
08d45be9b3 Fix hot reload bug on Win 10 (#4533)
* Fix hot reload bug on Win 10

* Fix hot reload bug on Win 10 - patch 2
2019-11-20 11:52:59 +01:00
Alexandre BODIN
8d5417d979
Merge branch 'master' into fix/json 2019-11-18 10:11:34 +01:00
Victor LAMBERT
cff8fd9041 Populate only role relation to authorize user 2019-11-16 01:05:21 +01:00
Alexandre BODIN
0837da7415
Merge branch 'master' into fix-slow-userspermissions-bootstrap 2019-11-14 17:52:56 +01:00
Jim LAURIE
f1190a7127 Get retried db config 2019-11-14 17:39:52 +01:00
Victor LAMBERT
59aff0af3c Retrieve roles without populating users and permissions relations 2019-11-14 16:36:35 +01:00
matthieuowlie
ef9de8815c Add POST route /auth/send-email-confirmation (#4270)
* Add POST route /auth/send-email-confirmation to call sendEmailConfirmation function of plugin users-permissions

* Add documentation about /auth/send-email-confirmation POST route

* Added documentation in docs\3.0.0-beta.x\plugins\users-permissions about email confirmation function

* Update code example for send-email-confirmation function
2019-11-13 18:45:23 +01:00
Abdón Rodríguez Davila
aa534b1a5c Use plugin in the GraphQL aggregation queries (#4508) 2019-11-13 16:19:47 +01:00
DMehaffy
5f28916210 Clean up template and remove keys that would break bookshelf/knex (#4444)
* Clean up template and remove keys that would break bookshelf/knex

* PR feedback remove debug
2019-11-13 15:21:08 +01:00
cyril lopez
447594684d Remove not needed webpack plugin (#4464) 2019-11-08 20:46:43 +01:00
Alexandre Bodin
b77ff396e5 Set initial value to empty string on null values to be consistent 2019-11-07 18:27:12 +01:00
Mickael D
9ae81b9dc9 fix(#2971): fix resolvers not correctly generated when model contains private attributes (#4441) 2019-11-07 09:19:35 +01:00
soupette
4f7f4a6c11 Fixes #2644 2019-11-06 17:51:23 +01:00
Jim LAURIE
d844d15a77
Merge branch 'master' into master 2019-11-06 17:29:31 +01:00
Jim LAURIE
0c735d319c
Merge branch 'master' into add_en_translations_for_uuid_and_icon 2019-11-06 16:48:53 +01:00
Guilherme Bernardino
f378680a00 Do not create manyRelation tables if autoMigration is false. (#4458)
ManyToMany and ManyWay relation tables are created even with the autoMigration option equal to false.
2019-11-06 14:46:52 +01:00
Jim LAURIE
baaa679aaf
Merge branch 'master' into add_en_translations_for_uuid_and_icon 2019-11-06 14:19:00 +01:00
Jim LAURIE
eab91ac6b9
Merge branch 'master' into master 2019-11-06 12:20:45 +01:00
Mateusz Ryszka
88dfdaad73 auto confirmation user with provider other than local 2019-11-06 09:56:31 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre Bodin
e0424d4b88 Fix security issue with reset password code 2019-11-04 17:40:53 +01:00