yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 115 Branches 488 Tags
Commit Graph

6761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
04045f1977
Merge pull request #1335 from johannpinson/patch-6 
Upgrade version to fix history bug on GraphQL Playground
 2018-06-08 17:14:56 +02:00
Aurelsicoko
fd47843b10 Get right global root path 2018-06-08 17:02:37 +02:00
ekamgit
6c3216cf51
Update hooks structure requirements 
The current hooks structure has package.json within the lib folder. This causes strapi to fail as it is looking for the package.json file in the hook root folder and not within lib.

This change moves the secondary files back into the hook root leaving only index.js in the lib folder.
 2018-06-08 23:05:48 +10:00
cyril lopez
6403df2960
Merge branch 'master' into bulk-actions 2018-06-08 12:21:11 +02:00
soupette
e6fafed2c2 Remove unappropriate filters 2018-06-08 12:19:04 +02:00
Kamal Bennani
e9fc37d03a
Add comment to handle fields of type array 2018-06-08 02:39:52 +02:00
Kamal Bennani
b85baf568e
use default format for fields of type string and text 2018-06-08 02:38:32 +02:00
Kamal Bennani
a8da79c6f8
Place the break in the correct place 2018-06-08 02:37:56 +02:00
Kamal Bennani
ec1872b031
Do not format value of type array and object because it will turn to zero 2018-06-08 02:37:24 +02:00
soupette
4d7b7fa1e0 Fixes #1269 2018-06-07 19:33:25 +02:00
soupette
7545afd28a Fix PR feedback 2018-06-07 19:13:17 +02:00
soupette
84fb1fda1c Fix conflicts 2018-06-07 18:54:40 +02:00
soupette
d716888296 Search with mongoose 2018-06-07 18:50:43 +02:00
Aurelsicoko
abc8395f2d Handle count for search query 2018-06-07 17:24:09 +02:00
Aurelsicoko
60e0c6dcdb Generate GIN indexes for Postgres database and handle search query 2018-06-07 17:16:19 +02:00
Aurelsicoko
846e14c036 Add search query and create index for text columns (MySQL support) 2018-06-07 16:14:04 +02:00
soupette
a90f60ddd0 Improve TableDelete and fix search request 2018-06-07 15:08:11 +02:00
Maxim Tkachuk
ec755fe8c4
Merge branch 'master' into master 2018-06-07 15:59:37 +03:00
Aurelsicoko
935727dbb0 Merge branch 'ctm-search' of github.com:strapi/strapi into ctm-search 2018-06-07 14:35:26 +02:00
Aurelsicoko
d8e2a1647c Add query system to handle search 2018-06-07 14:35:09 +02:00
soupette
f47ac188cb Reset search when adding filters 2018-06-07 14:26:00 +02:00
Daniel Ruf
a4e35f4146
chore: test against Node.js 8 and 10 2018-06-07 13:37:26 +02:00
Johann Pinson
e923971805
feat(playground): upgrade the minimal version 2018-06-07 12:51:10 +02:00
Jim LAURIE
cbca97feb3
Merge pull request #1329 from strapi/3.0.0-alpha.12.3 
3.0.0-alpha.12.3
 2018-06-07 11:59:33 +02:00
soupette
228e04c44e Move settings-manager to configs 2018-06-07 11:32:43 +02:00
Makzimko
5d4c134846 Enhance onboard message CLI 2018-06-07 11:59:38 +03:00
soupette
07d007ebb4 Front-end search logic 2018-06-07 10:38:30 +02:00
Jim LAURIE
740471024c
Merge branch 'master' into patch-2 2018-06-06 21:02:20 +02:00
soupette
fc5434037f Init search component 2018-06-06 18:51:24 +02:00
soupette
e9e7d48119 Fix PR feedback 2018-06-06 17:46:18 +02:00
soupette
40b267a6a6 Merge branch 'master' of github.com:strapi/strapi into fix-1262 2018-06-06 17:46:04 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 v3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
soupette
c8492a6b11 Clean code 2018-06-06 16:49:25 +02:00
soupette
127179cd76 Fix conflicts 2018-06-06 16:24:11 +02:00
soupette
e7357e025c Handle delete many with models from users-permissions 2018-06-06 16:20:52 +02:00
Jim LAURIE
c2df2ae393
Merge pull request #1327 from strapi/fix-build-assets-link 
Fix build assets url
 2018-06-06 14:57:10 +02:00
Jim LAURIE
4d0083a4b6
Merge branch 'master' into fix-build-assets-link 2018-06-06 14:43:57 +02:00
Jim LAURIE
796484b6ad
Merge pull request #1326 from strapi/fix-remove-manyToMany 
Fix delete relations manyToMany mongoose
 2018-06-06 14:43:38 +02:00
Jim LAURIE
3a4001da22
Merge branch 'master' into fix-remove-manyToMany 2018-06-06 14:29:32 +02:00
Jim Laurie
cc9abff66d Fix build assets 2018-06-06 14:18:23 +02:00
soupette
92600ab7b0 Handle bulk action for bookshelf 2018-06-06 12:47:29 +02:00
Jim Laurie
72f75ce8ec Fix delete relations manyToMany mongoose 2018-06-06 12:06:05 +02:00
Jim LAURIE
d8c9b54e5a
Merge pull request #1321 from strapi/fix-ctm-build 
Fix content-manager build
 2018-06-05 19:29:33 +02:00
soupette
a7411bbd9d Fix conflicts in Strapi.js 2018-06-05 19:12:25 +02:00
soupette
5698969770 Fix build 2018-06-05 19:03:59 +02:00
soupette
8832a5baab Delete many and update relations 
Co-authored-by aurelsicoko@gmail.com
 2018-06-05 18:35:19 +02:00
soupette
e145c82b7a Front 2018-06-05 17:56:53 +02:00
soupette
4e2b7218f6 Bulk actions front-end done 2018-06-05 14:20:13 +02:00
Jim LAURIE
9cde216457
Merge pull request #1304 from strapi/content-manager-filters 
Add filters in the content-manager
 2018-06-05 12:23:05 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00