yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,044 Commits 123 Branches 507 Tags
Commit Graph

7044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
64d65fef45
Merge pull request #2808 from strapi/single-redux-store 
Single redux store
 2019-02-15 09:54:22 +01:00
Jim LAURIE
aea6a2537c
Merge branch 'master' into single-redux-store 2019-02-15 09:54:15 +01:00
Jim LAURIE
68a0e17512
Merge pull request #2832 from abdonrd/patch-2 
Update PULL_REQUEST_TEMPLATE
 2019-02-15 09:48:42 +01:00
Abdón Rodríguez Davila
c3375315b3
Update PULL_REQUEST_TEMPLATE.md 2019-02-14 22:47:02 +01:00
soupette
928971b1e3 Fix PR feedback and change stores name with <pluginId>_<containerName> 2019-02-14 09:48:39 +01:00
Jim LAURIE
5f48dbfbe2
Merge pull request #2822 from siffash/patch-1 
Catch error for auto open Google Chrome with AppleScript
 2019-02-13 19:56:49 +01:00
Anton
bf91b143e8
#2817 
Catch error for auto open browser
 2019-02-13 14:26:36 +02:00
soupette
e8816d93a4 Merge branch 'master' of github.com:strapi/strapi into single-redux-store 2019-02-12 09:41:50 +01:00
soupette
8c269be778 Update generators with pluginId 2019-02-12 09:40:25 +01:00
soupette
9e1084ed04 Harmonize pluginId between plugins 2019-02-11 18:56:17 +01:00
soupette
85774b2f51 Update plugin generators 2019-02-11 18:35:46 +01:00
soupette
d81fba0488 Update tests with the single store 2019-02-11 18:13:14 +01:00
Jim LAURIE
34ff5a3680
Merge pull request #2806 from strapi/enhancement/error 
Catch errors during the process generation
 2019-02-11 18:01:32 +01:00
Aurélien Georget
8a60c1a690 Reorder load of dependencies 2019-02-11 17:39:07 +01:00
Aurélien Georget
d3e46ef279 Merge branch 'master' of github.com:strapi/strapi into enhancement/error 2019-02-11 17:00:33 +01:00
Aurélien Georget
83836aa255 Retrieve error during project generation 2019-02-11 17:00:26 +01:00
Jim LAURIE
e8817e2fe4
Merge pull request #2753 from strapi/fix/ctm-edit-view-main-field 
Fix displayed field when deleting the field
 2019-02-11 15:28:40 +01:00
Jim LAURIE
83f0bb012a
Merge branch 'master' into fix/ctm-edit-view-main-field 2019-02-11 15:28:13 +01:00
soupette
46e13f71c6 Remove single store documentation and settings manager 2019-02-11 14:57:20 +01:00
soupette
835a26e8c3 Fix ctm 2019-02-11 14:49:10 +01:00
soupette
22c5ba819e Remove single for content type b 2019-02-11 14:26:20 +01:00
soupette
b52b010b61 Remove single store for email 2019-02-11 14:08:22 +01:00
soupette
39934fd360 Remove single store for upload 2019-02-11 14:05:06 +01:00
soupette
72cc7d0837 Remove separate store for users-permissions 2019-02-11 13:55:49 +01:00
Jim LAURIE
ba471149ea
Merge pull request #2736 from sajjad-shirazy/master 
Supporting `IN` and `NOT IN` as a filter type
 2019-02-10 17:26:31 +01:00
Jim LAURIE
92abd536cb
Merge branch 'master' into master 2019-02-10 17:26:18 +01:00
Jim LAURIE
e9a0a80831
Merge pull request #2747 from jacargentina/fix-2549 
Fix can not access to the admin folder
 2019-02-09 13:17:08 +01:00
Jim LAURIE
76816c18ee
Merge branch 'master' into fix-2549 2019-02-09 13:16:57 +01:00
Jim LAURIE
7f211d1753
Merge pull request #2796 from aminsource/patch-1 
Update graphql.md
 2019-02-09 10:15:34 +01:00
Hooman Amin
f2d0112ba8
Update graphql.md 2019-02-09 10:14:43 +03:30
Jim LAURIE
8602a3e1a9
Merge pull request #2754 from jacargentina/fix-2752 
Remove temp files after upload (ie. avoid "No space left on device" errors)
 2019-02-08 22:06:46 +01:00
Jim LAURIE
7595a4f9c8
Merge branch 'master' into fix-2752 2019-02-08 22:06:17 +01:00
Jim LAURIE
10b682b160
Merge pull request #2792 from strapi/enhancement/error 
Add error events during project generation
 2019-02-08 20:29:31 +01:00
Aurélien Georget
4812f34bd5 Add error events during project generation 2019-02-08 18:13:40 +01:00
Jim LAURIE
3c0d330e22
Merge pull request #2786 from strapi/3.0.0-alpha.23.1 
3.0.0-alpha.23.1
v3.0.0-alpha.23.1 		2019-02-07 13:10:02 +01:00
Jim LAURIE
42b4a56c0a 3.0.0-alpha.23.1 2019-02-07 13:08:41 +01:00
Jim LAURIE
ad749fc4be
Merge pull request #2785 from strapi/enhancement/success 
Associate machine id to user
 2019-02-07 13:04:51 +01:00
Aurélien Georget
143446593a Associate machine id to user 2019-02-07 12:56:09 +01:00
Jim LAURIE
f7e74fed0a
Merge pull request #2780 from strapi/3.0.0-alpha.23 
3.0.0 alpha.23
 2019-02-07 10:42:02 +01:00
Jim LAURIE
ff84a82466 3.0.0-alpha.23 v3.0.0-alpha.23 2019-02-07 10:40:33 +01:00
Jim LAURIE
b8045455da Add migration alpha-23 2019-02-07 10:40:04 +01:00
Jim LAURIE
50d856ddfa
Merge pull request #2756 from EpicUsaMan/patch-1 
Fix send confirm email on SQL
 2019-02-07 10:27:56 +01:00
Jim LAURIE
a72c02fd8f
Merge branch 'master' into patch-1 2019-02-07 10:27:43 +01:00
EpicUsaMan
82f83260e9
Fix after pull request review 2019-02-06 21:57:50 +02:00
Jim LAURIE
0cc26762c5
Merge pull request #2773 from strapi/enhancement/success 
Improve error detection
 2019-02-06 16:55:27 +01:00
Aurélien Georget
b390190f99 Send errors to tracker 2019-02-06 16:48:15 +01:00
Aurélien Georget
ffd57584d5 Merge branch 'master' of github.com:strapi/strapi into enhancement/success 2019-02-06 16:45:32 +01:00
Aurélien Georget
f6824b5b04 Add event to detect content type creation fail 2019-02-06 16:45:04 +01:00
Aurélien Georget
1091b218c2 Add event to identify quickstart issue 2019-02-06 15:59:59 +01:00
Jim LAURIE
880921b5f5
Merge pull request #2772 from strapi/enhancement/success 
Detect Yarn installation in success script
 2019-02-06 14:55:12 +01:00