29765 Commits

Author SHA1 Message Date
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
Jonathan Dobson
5750429920
Merge branch 'master' into patch-1 2019-02-11 22:37:13 +08: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
David Kartuzinski
5484b87a98 quick start and quick start detailed pages completed, tested and compared. Various typos and minor changes completed. Both ready to be published. 2019-02-11 14:27:07 +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
Jonathan Dobson
e278da1836
Improved educational flow and language.
Simplified the language.
Rewrite some of the paragraphs to emphasize key learning points.
Made "Token Usage" as first point of the introduction as tokens are the basis for authentication.
2019-02-11 09:44:19 +08: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
Ky
c1ffbbfb57 Content manager Links with injected components (UI in progress) 2019-02-08 19:23:02 +01:00
David Kartuzinski
3902e1934f getting started detailed completed. Images moved to proper folder to match document name. Add API-Routes page. 2019-02-08 18:21:38 +01:00
Aurélien Georget
4812f34bd5 Add error events during project generation 2019-02-08 18:13:40 +01:00
David Kartuzinski
171c574b59 Images and content completed for detailed view through adding Restuarant Content types 2019-02-07 21:36:01 +01:00
David Kartuzinski
b9f1095777 Quick Start - both detailed and intermediate versions through Create Admin User completed. next Step is Create a Content Type. Removed extra images. Various typo corrections in Installation section. 2019-02-07 15:49:37 +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
David Kartuzinski
e9e551f37b two versions of Quick Start. One intermediate version and on detailed. A few minor changes in Install Requirements. 2019-02-06 19:16:54 +01:00
David Kartuzinski
812d4c5911 changed the colors to be muted, fixed formatting on Installation Requirements page 2019-02-06 17:23:57 +01:00
David Kartuzinski
77faabc7c3 Installation Requirements page now ready to be reviewed. Minor styling elements in the CSS fixed or improved. Internal links, words used (e.g. 'Create admin user' instead of 'Create first user') changed to describe. Clearer navigation in Menu and on page 2019-02-06 16:59:33 +01: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
Jim LAURIE
b93e48fc52
Merge branch 'master' into enhancement/success 2019-02-06 14:55:05 +01:00
Aurélien Georget
3e62c372f8 Detect Yarn installation 2019-02-06 14:49:46 +01:00
Jim LAURIE
be4a2b760c
Merge pull request #2767 from vedran-brnjetic/patch-1
Docker link had a closing bracket at the end
2019-02-06 12:38:23 +01:00