yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 21:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,860 Commits 118 Branches 489 Tags
Commit Graph

10860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
8c8dc98112
Merge branch 'master' into file-size-type-integer 2019-12-09 10:12:24 +01:00
Alexandre BODIN
5872514bbc
Merge pull request #4440 from AHgPuK/master 
Fix empty date wrong display
 2019-12-09 10:11:33 +01:00
Alexandre BODIN
6bf4cfd65b
Merge branch 'master' into master 2019-12-09 10:11:05 +01:00
Alexandre BODIN
6a9df0fcde
Merge pull request #4645 from Froelund/patch-7 
Use the id of entry to update relations
 2019-12-09 10:07:11 +01:00
Alexandre BODIN
309be28183
Merge branch 'master' into patch-7 2019-12-09 10:06:52 +01:00
Alexandre BODIN
ca751294e0
Merge pull request #4654 from AnandChowdhary/patch-1 
Change "Mac O/S" to "macOS"
 2019-12-09 10:06:17 +01:00
Alexandre BODIN
3af9905f4c
Merge branch 'master' into patch-1 2019-12-09 10:06:10 +01:00
Alexandre BODIN
4602318eae
Merge pull request #4656 from shuson/patch-1 
Update model.template
 2019-12-09 10:05:26 +01:00
Alexandre BODIN
d6f93bb755
Merge branch 'master' into patch-1 2019-12-09 10:04:30 +01:00
Alexandre BODIN
c10a985600
Merge pull request #4659 from pouyamiralayi/patch-1 
Update upload.md documentation
 2019-12-09 10:04:09 +01:00
Alexandre BODIN
232363beec
Merge branch 'master' into patch-1 2019-12-09 10:03:47 +01:00
Alexandre BODIN
c27cb3a0fb
Merge pull request #4671 from strapi/docs-draft 
Add guide to create a draft system
 2019-12-09 10:02:17 +01:00
Alexandre BODIN
ec6906c96c
Merge branch 'master' into docs-draft 2019-12-09 10:02:09 +01:00
Alexandre BODIN
f2571b0b2d
Merge pull request #4540 from victorlambert/improve-authorization-performance 
Populate only role relation to authorize user
 2019-12-09 09:58:08 +01:00
Alexandre BODIN
3acd646701
Merge branch 'master' into improve-authorization-performance 2019-12-09 09:57:58 +01:00
Alexandre BODIN
874df1846e
Merge pull request #4674 from mnelemans/fix/bookshelf-relations-search 
Wrap tsvector attributes with coalesce before join
 2019-12-09 09:56:30 +01:00
Jørgensen
8087a4ada5
Merge branch 'master' into patch-7 2019-12-09 09:24:03 +01:00
Rodrigo Espinosa
4348038d36
Alphabetize concepts/file-structure.md docs 2019-12-09 00:08:51 -05: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
Jim LAURIE
344f825778 Fix typo 2019-12-06 19:05:15 +01:00
Jim LAURIE
959472231f Add guide to create a draft system 2019-12-06 19:00:00 +01:00
Virginie Ky
d80cc1c898 CM UI fixes 2019-12-06 18:27:07 +01:00
Sergey Pravosud
23eb263e07 added missed comma in ecosystem.config.js example (#4657) 2019-12-06 17:15:12 +01:00
soupette
305ed06634 Change trash icon 2019-12-06 17:11:17 +01:00
soupette
c81624bda1 Fix functional feedback 2019-12-06 16:40:50 +01:00
Alexandre Bodin
f5a9494cb8 Remove certain content types from ctm list 2019-12-06 16:18:35 +01:00
soupette
4cc805a037 Remove plugin key 2019-12-06 16:10:53 +01:00
Jim LAURIE
2e5855b052 Add sqreen guide 2019-12-06 15:17:48 +01:00
soupette
9967a30932 Clean logs 2019-12-06 15:14:59 +01:00
Jim LAURIE
d394eedf56
Merge pull request #4667 from strapi/docs-strapi-console 
Add strapi console command
 2019-12-06 14:43:58 +01:00
Alexandre BODIN
85c4dbe2bc
Merge branch 'master' into docs-strapi-console 2019-12-06 14:43:36 +01:00
Alexandre BODIN
d0d0942a14
Dynamic zone support configurable prop on attributes (#4664) 
* Add event on component creation

* Handle configurable attributes
 2019-12-06 14:42:05 +01:00
Jim LAURIE
95d707dc0e Add strapi console comand 2019-12-06 14:40:25 +01:00
soupette
30c70deb3b Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-06 14:38:32 +01:00
Alexandre Bodin
6f7197f87a Add Time and Date scalar to graphql plugin 2019-12-06 14:32:53 +01:00
Sulakin Vadim
f5ca33c0df
Merge branch 'master' into master 2019-12-06 14:58:07 +03:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
Alexandre Bodin
b4c6c4f271 Merge branch 'master' into develop 2019-12-06 12:35:22 +01:00
Sleva
52f5770b06 Updated ApolloServer configuration for introspection queries (#4660) 2019-12-06 12:35:06 +01:00
Alexandre Bodin
2bf3533c85 Merge branch 'master' into develop 2019-12-06 12:34:26 +01:00
Alexandre Bodin
7008a8aca4 Check table exists for sqlite3 alter datetime 2019-12-06 12:31:53 +01:00
soupette
df0e8951ea fix component display name 2019-12-06 11:37:58 +01:00
soupette
c001fe1f3d Remove i tags 2019-12-06 11:09:48 +01:00
soupette
3570ce43e2 Fix source issue 2019-12-06 10:44:27 +01:00
soupette
dc9dd4ccfd Display layout button in prod mode 2019-12-06 09:17:10 +01:00
soupette
2b85c97c0e Fix conflicts 2019-12-06 09:08:12 +01:00
soupette
7b6a24c99e Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview 2019-12-06 08:59:27 +01:00
Sulakin Vadim
a858c66158
Merge pull request #4 from sulakin/Adding-a-VK-Provider 
add vk
 2019-12-06 01:45:26 +03:00
Sulakin Vadim
13af6f1ee0
Merge pull request #3 from strapi/master 
Update from the wizard
 2019-12-06 01:42:31 +03:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03:00