yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,903 Commits 113 Branches 491 Tags
Commit Graph

608 Commits

Author SHA1 Message Date
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
907efd0471 Merge branch 'master' into develop 2019-11-06 14:59:19 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre Bodin
1fcc8d00fa Merge branch 'master' into develop 2019-10-29 23:04:57 +01:00
Alexandre Bodin
d73e842d2f Improve the error message on install dependencies error in create strapi-app 2019-10-29 09:00:17 +01:00
Aurélien Georget
ce02440ba5 Update initialisation detection when starting a project 2019-10-28 16:48:54 +01:00
Alexandre Bodin
66b2d4f5c3 Init 2019-10-23 17:02:23 +02:00
Alexandre Bodin
7a61db7285 v3.0.0-beta.17.4 2019-10-23 15:11:30 +02:00
Alexandre Bodin
9280cf9cd7 Merge branch 'master' into develop 2019-10-22 11:15:09 +02:00
Alexandre Bodin
3ddd383c30 v3.0.0-beta.17.3 2019-10-22 11:05:52 +02:00
soupette
6a852ad6cb Fix conflicts 2019-10-18 15:51:44 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre Bodin
f0ad2ab52c Merge branch 'master' into develop 2019-10-16 14:16:52 +02:00
Alexandre Bodin
9f0713649b v3.0.0-beta.17.1 2019-10-16 11:42:54 +02:00
Alexandre Bodin
3f68d45cd2 Fix err.stderr not defined 2019-10-16 11:37:42 +02:00
Alexandre Bodin
7c8eda443e v3.0.0-beta.17 2019-10-16 10:40:18 +02:00
Alexandre Bodin
58f0706840 Fix localPluginsToCopy 2019-10-15 18:33:27 +02:00
Alexandre Bodin
866a612d41 Merge branch 'master' into develop 2019-10-15 17:48:45 +02:00
Alexandre Bodin
4e1ee0b5db Fix lint 2019-10-15 17:18:21 +02:00
Alexandre Bodin
c0683cad2f Remove eslint from project generation to gain speed and keep node compat 2019-10-15 17:18:20 +02:00
Alexandre Bodin
0367a55751 Improve sentry error analytics and startup message 2019-10-15 17:18:20 +02:00
Alexandre Bodin
85cd288526 Capture more detailed events 2019-10-15 17:18:19 +02:00
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00
Alexandre Bodin
b43fba4a79 Console log error before capture in sentry to get the detailed logs 2019-10-08 10:14:43 +02:00
soupette
75abb17f0f Fix conflicts 2019-10-08 09:17:47 +02:00
Alexandre Bodin
2d04d25097 v3.0.0-beta.16.8 2019-10-04 11:57:46 +02:00
soupette
6b0acc7b8e Remove settings-manager 2019-10-02 17:27:22 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
Alexandre Bodin
7c84795d8a Use stderr instead of message 2019-09-26 15:35:55 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Alexandre Bodin
571e7f3579 Factorize sentry capture code 2019-09-26 14:03:22 +02:00
Alexandre Bodin
67e60369df Add sentry to strapi-generate-new 2019-09-26 12:33:36 +02:00
Alexandre Bodin
2d6864f836 Disable p3p by default 2019-09-20 12:45:31 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Abdón Rodríguez Davila
118691808b Update ESLint to v6.3 2019-09-09 15:28:59 +02:00
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update 
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
 2019-09-09 15:26:35 +02:00
Alexandre Bodin
2530606e47 Merge branch 'master' into chore/routing-x-forwarded 2019-09-09 14:29:07 +02:00