29765 Commits

Author SHA1 Message Date
Satrio Wisnugroho
ec1c278618 Fix indentation 2018-01-22 11:08:05 +07:00
Satrio Wisnugroho
7f2fcd7c94 Fix missing comma 2018-01-22 10:41:31 +07:00
Jim LAURIE
cf4ec81993
Merge branch 'master' into fix/list-plugins 2018-01-19 18:36:33 +01:00
Jim LAURIE
69f1ea7d7a
Merge pull request #486 from strapi/alpha.8.3
Alpha.8.3
2018-01-19 18:36:18 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +01:00
cyril lopez
9b1347d092 Add link to documentation for templating emails 2018-01-19 17:43:00 +01:00
cyril lopez
308b8ee04b Created users-permissions documentation folder 2018-01-19 17:31:45 +01:00
Jim LAURIE
f62fc05aa5
Merge pull request #484 from strapi/hotfix/deploy-2
Hotfix/deploy 2
v3.0.0-alpha.8.3
2018-01-19 17:21:39 +01:00
cyril lopez
e10309145e Edit providers 2018-01-19 17:16:14 +01:00
Jim LAURIE
b04a2250a2
Merge pull request #469 from Nsbx/master
Fix package 'strapi-generate-new' on Windows
2018-01-19 16:55:58 +01:00
Aurelsicoko
5b93cc5242 3.0.0-alpha.8.3 2018-01-19 16:49:57 +01:00
Nicolas Bondoux
c6841edfd7
Merge branch 'master' into master 2018-01-19 16:06:22 +01:00
Aurelsicoko
3c9e18564d Report changes from branch hotfix/deploy 2018-01-19 15:58:29 +01:00
Nicolas Bondoux
e60876fe0d
Fix use ShellJS 2018-01-19 15:41:01 +01:00
cyril lopez
630e06d7fa Get providers 2018-01-19 15:14:51 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
cyril lopez
9572bf9749 Put email templates 2018-01-19 13:52:43 +01:00
Jim Laurie
c66e2b382a update strapi plugin email package 2018-01-19 13:38:33 +01:00
cyril lopez
11c5905d25 form to edit email templates 2018-01-19 13:34:55 +01:00
Jim LAURIE
e7c43e5786
Merge pull request #478 from strapi/alpha.8.1
Alpha.8.2
2018-01-19 12:24:36 +01:00
Jim LAURIE
07a84b5984
Merge branch 'master' into alpha.8.1 2018-01-19 12:08:10 +01:00
Jim Laurie
19ee51376b Add repo location in plugins package 2018-01-19 12:06:08 +01:00
Jim LAURIE
a76b0022c0
Merge pull request #477 from acifer/patch-3
Updates the Summary.md to refer to correct Authentication page
2018-01-19 09:44:01 +01:00
Jim LAURIE
2e55706fdb
Merge branch 'master' into alpha.8.1 2018-01-19 09:15:28 +01:00
acifer
1413069d6b
Updates the Summary.md to refer to correct Authentication page
Reference to authentication was broken when its name was updated. Its fixed with correcting the filename.
2018-01-19 09:08:52 +01:00
Jim Laurie
7b0a106cb2 3.0.0-alpha.8.2 2018-01-19 08:52:34 +01:00
Jim Laurie
5accaf30e3 Hot fix permission detection 2018-01-19 07:38:30 +01:00
Luca Perret
4de3abe9e9 fix(mongoose): unescaped character in username/password 2018-01-18 23:37:16 +01:00
Luca Perret
0641c7b279 fix(plugin-users-permissions): undefined value 2018-01-18 23:27:59 +01:00
Luca Perret
2816863cfc fix(plugin-users-permissions): auth register lower case identifier 2018-01-18 23:27:59 +01:00
Luca Perret
d0d70976c9 feat(plugin-users-permissions): auth email case-insensitive 2018-01-18 23:27:59 +01:00
Amit Yadav
5d9a49256a
Fixes https://github.com/strapi/strapi/issues/467 2018-01-18 23:34:20 +05:30
cyril lopez
f6497639e7 List email-templates 2018-01-18 18:21:49 +01:00
cyril lopez
405272eadf Refacto onChange action 2018-01-18 17:27:59 +01:00
cyril lopez
97d6f49f93 Update branch
Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front
2018-01-18 16:25:31 +01:00
cyril lopez
c453954f3b Add submit dynamic 2018-01-18 16:23:31 +01:00
Nicolas Bondoux
6b1deaf0ed
Merge branch 'master' into master 2018-01-18 16:07:33 +01:00
Jim LAURIE
8b069da4e1
Merge pull request #466 from strapi/doc-migration-alpha.8
Add migration from alpha.7.4 to alpha.8
2018-01-18 16:06:16 +01:00
Nicolas Bondoux
ed80aa4c86
Fix generate new package on windows 2018-01-18 16:02:32 +01:00
Jim Laurie
f9920a4739 Disable local provider 2018-01-18 16:01:52 +01:00
Jim Laurie
5e8259af73 Can disable a provider 2018-01-18 15:45:02 +01:00
Jim LAURIE
256f0912a5
Merge branch 'master' into doc-migration-alpha.8 2018-01-18 15:27:35 +01:00
cyril lopez
9867324fa6 Display advanced settings in users plugin 2018-01-18 15:26:33 +01:00
Jim Laurie
fc22f13cfc Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 15:15:25 +01:00
Pierre BURGY
1c555293b1
Update README.md
Change Getting Started link in README.md
2018-01-18 15:10:55 +01:00
Jim Laurie
6da09af501 Fix plugin multi middleware 2018-01-18 14:53:25 +01:00
Jim Laurie
6ae2f6dfee Add unique email verification on user update 2018-01-18 14:10:26 +01:00
cyril lopez
22d90dabe9 Change front-end routing params : advanced-settings => advancedg 2018-01-18 14:06:52 +01:00
cyril lopez
286c519641 Update branch
Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front
2018-01-18 13:46:22 +01:00