9873 Commits

Author SHA1 Message Date
Alexandre Bodin
fbecade1c9 Update dynamic zones, bookshelf 2019-11-13 18:49:03 +01:00
Alexandre Bodin
79d1207c0c Create dynamiczone in queries 2019-11-13 18:49:02 +01:00
Alexandre Bodin
b9122edf0d Rename groups to components 2019-11-13 18:49:02 +01:00
Alexandre Bodin
4ee0160e6c Remove general settings 2019-11-13 18:49:01 +01:00
Alexandre BODIN
5cda51043c
Use where instead of forge to make queries (#4488) 2019-11-13 18:42:59 +01:00
Alexandre Bodin
cca3c80b87 Merge branch 'master' into develop 2019-11-13 16:30:11 +01:00
Abdón Rodríguez Davila
aa534b1a5c Use plugin in the GraphQL aggregation queries (#4508) 2019-11-13 16:19:47 +01:00
Alexandre BODIN
6f9bfb7fe9
Merge pull request #4418 from strapi/enhancement/homepage-server
New design for the server homepage
2019-11-13 16:17:57 +01:00
Alexandre Bodin
236e15a9e5 Do not display both dev views on load 2019-11-13 16:16:16 +01:00
Aurélien Georget
4b3fdb94f1 parent 1fcc8d00fa15546ce750fe886c5cb6e704ee2469
author Aurélien Georget <aurelsicoko@gmail.com> 1572447760 +0100
committer Alexandre Bodin <bodin.alex@gmail.com> 1573655280 +0100

Create mini-templating system to send none-critical information to static index

Add new index.html and production.html pages

Update design (w/ responsive) of server homepage

Use Lodash template system instead of custom one

fix: Ensure state is updated before updating select

Update migration-guide-beta.16-to-beta.17.4.md

use limit=0 to get full data set

Add new index.html and production.html pages

Update design (w/ responsive) of server homepage

Use Lodash template system instead of custom one

Apply feedback
2019-11-13 15:38:26 +01:00
Alexandre Bodin
a86b886bd1 Merge branch 'master' into develop 2019-11-13 15:22: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
Alexandre Bodin
906423263e Merge branch 'master' into develop 2019-11-08 23:29:40 +01:00
cyril lopez
447594684d Remove not needed webpack plugin (#4464) 2019-11-08 20:46:43 +01:00
Alexandre BODIN
be8207ecfc
Merge pull request #4478 from strapi/removeSecurityTemplate
Remove security issue template
2019-11-08 20:45:01 +01:00
Derrick Mehaffy
d57071829b
Remove security issue template 2019-11-07 18:23:12 -07:00
Alexandre Bodin
cc34bf335c Update strapi-database version 2019-11-07 09:27:34 +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
Jim LAURIE
a30862611d
Merge pull request #4462 from Mateuszry/master
Auto confirmation user with provider other than local
2019-11-06 17:47:54 +01:00
Jim LAURIE
d844d15a77
Merge branch 'master' into master 2019-11-06 17:29:31 +01:00
Jim LAURIE
fc4e48ef8f
Merge pull request #4406 from mhelmetag/add_en_translations_for_uuid_and_icon
Add uuid attribute translations and uuid icon for content builder
2019-11-06 17:28:37 +01:00
Jim LAURIE
0c735d319c
Merge branch 'master' into add_en_translations_for_uuid_and_icon 2019-11-06 16:48:53 +01:00
Alexandre Bodin
907efd0471 Merge branch 'master' into develop 2019-11-06 14:59:19 +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
1c7082372e
Merge pull request #4242 from ledgitbe/master
Fix error handling in OAuth providers + Enhance Github provider
2019-11-06 14:18:52 +01:00
Jim LAURIE
eab91ac6b9
Merge branch 'master' into master 2019-11-06 12:20:45 +01:00
Jim LAURIE
b2a06d149d
Merge pull request #4438 from derrickmehaffy/master
Update discussion template to clarify it's use.
2019-11-06 11:57:01 +01:00
Jim LAURIE
1942b34826
Merge branch 'master' into master 2019-11-06 11:56:52 +01:00
Mateusz Ryszka
88dfdaad73 auto confirmation user with provider other than local 2019-11-06 09:56:31 +01:00
Jim LAURIE
5edde3f1ec
Merge pull request #4452 from clorichel/patch-1
Add Strapi environment to Sentry error
2019-11-06 09:33:17 +01:00
Jim LAURIE
5232a07eb6
Merge branch 'master' into patch-1 2019-11-06 09:32:52 +01:00
Jim LAURIE
696b5cd9dd Add new line 2019-11-06 09:26:25 +01:00
Alexandre BODIN
6df1cd58d1
Merge pull request #4454 from strapi/chore/serv-admin
Serve index.html in a simpler way
2019-11-05 11:57:25 +01:00
Alexandre Bodin
e4e6cba9c8 Server index.html of the admin when nothin else is found on url with /admin 2019-11-05 11:37:46 +01:00
Jim LAURIE
170203bebc
Merge pull request #4422 from hanif66/hanif66-hanif-1
Fix typos in deployment docs
2019-11-05 11:30:43 +01:00
Jim LAURIE
f893b963de
Merge branch 'master' into hanif66-hanif-1 2019-11-05 11:30:17 +01:00
Pierre-Alexandre
f213ed8a6a
adding Strapi environment to Sentry error
and a reminder to actually install the package
2019-11-05 11:16:20 +01:00
Alexandre BODIN
fc7e6d5f00
Merge pull request #4451 from strapi/lauriejim-patch-1
Fix typo on security.md
2019-11-05 10:01:40 +01:00
Jim LAURIE
8817a9952b Fix typo in issue template 2019-11-05 09:58:49 +01:00
Jim LAURIE
1255533eab
Fix typo on security.md 2019-11-05 09:39:56 +01:00
Jim LAURIE
3c5153db98
Merge pull request #4447 from strapi/add/securityInfo
Move security information to proper location
2019-11-05 09:26:17 +01:00
Jim LAURIE
c1fbe48127
Merge branch 'master' into add/securityInfo 2019-11-05 09:26:00 +01:00
Derrick Mehaffy
28415e97fa
Move security doc, was in the wrong spot 2019-11-04 15:42:30 -07:00
Jim LAURIE
5bca7724c8
Merge pull request #4446 from strapi/add/securityInfo
Add security and vulnerability reporting page
2019-11-04 23:37:02 +01:00
Jim LAURIE
41fa98a22a
Fix typo 2019-11-04 23:36:07 +01:00
Derrick Mehaffy
1b21af4877
PR feedback for issue template 2019-11-04 15:25:09 -07:00
Derrick Mehaffy
d6aa047c81
Add security and vulnerability reporting page 2019-11-04 15:06:49 -07:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre BODIN
1162698778
Merge pull request #4443 from strapi/fix/security
Fix security issue with reset password
2019-11-04 17:50:23 +01:00