yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,957 Commits 138 Branches 514 Tags
Commit Graph

8957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
websocket98765
71b2993f33
Fix typo in en.json 
Fixs `Make you sure you understand` to `Make sure you understand`.
 2019-09-09 22:29:02 +00:00
Alexandre BODIN
eec3acfa63
Merge pull request #3923 from strapi/front/qa 
Content manager update field infos display on editview
 2019-09-09 17:47:43 +02:00
Alexandre BODIN
32d3df8fbb
Merge branch 'master' into front/qa 2019-09-09 17:46:59 +02:00
Virginie Ky
01045a5a1b content manager update field infos on editview UI fix 2019-09-09 17:23:56 +02:00
Alexandre BODIN
7fe97b3e54
Merge pull request #3892 from shabab477/bugfix/cli-creating-extra-model-folder 
Fix issue with duplicate model folder getting created when generating model with api option
 2019-09-09 16:45:22 +02:00
Alexandre BODIN
1a9f4e8e59
Merge branch 'master' into bugfix/cli-creating-extra-model-folder 2019-09-09 16:45:15 +02:00
Alexandre BODIN
d3cf6fd613
Merge pull request #3855 from abdonrd/koa-update 
Update koa dependencies
 2019-09-09 16:41:45 +02:00
Abdón Rodríguez Davila
1015540af9 Update koa dependencies 2019-09-09 14:39:57 +02:00
Alexandre BODIN
1593c122c6
Merge branch 'master' into bugfix/cli-creating-extra-model-folder 2019-09-09 14:38:48 +02:00
Alexandre BODIN
d65e60e94d
Merge pull request #3852 from strapi/fix/fr_template 
Revert and fix the feature request template
 2019-09-09 14:31:35 +02:00
Alexandre BODIN
b0433e03f5
Merge branch 'master' into fix/fr_template 2019-09-09 14:31:14 +02:00
Jim LAURIE
f00be91230
Merge pull request #3915 from strapi/readme 
Readme to change image, and fix installation commands
 2019-09-09 13:42:16 +02:00
Jim LAURIE
f90ab75c54
Merge branch 'master' into readme 2019-09-09 13:41:53 +02:00
Alexandre Bodin
05597970fa v3.0.0-beta.16 v3.0.0-beta.16 2019-09-09 13:35:57 +02:00
Alexandre BODIN
6309af25c9
Merge pull request #3664 from strapi/develop 
Group and Repeatable Fields
 2019-09-09 13:32:28 +02:00
Alexandre Bodin
3186da5f25 Add section on the richtext type 2019-09-09 12:24:24 +02:00
cyril lopez
d58532078b
Merge pull request #3920 from strapi/front/qa 
Groups & repeatable QA
 2019-09-09 12:11:55 +02:00
virginieky
dcf1253622
Merge branch 'develop' into front/qa 2019-09-09 12:04:18 +02:00
Virginie Ky
d13bba6f0d redirect fix on group main infos update 2019-09-09 11:59:25 +02:00
Alexandre BODIN
29579f90c1
Merge pull request #3912 from strapi/docs/migration-guide-beta.16 
Add migration guide to beta.16
 2019-09-09 11:10:37 +02:00
davidkartuzinski
211f8d1846 clarified a sentence regarding the quickstart 2019-09-06 17:45:04 +02:00
Alexandre BODIN
6a127b3d20
Merge branch 'develop' into docs/migration-guide-beta.16 2019-09-06 17:28:45 +02:00
davidkartuzinski
64f342234f removed an unnecessary reference to the roadmap- the roadmap was referenced twice, a tiny restructure regarding the Community Support section and add an explanation about SQLite being using in the Quickstart 2019-09-06 17:16:43 +02:00
davidkartuzinski
8fefb18edf Remove sponsors per @pierreburgy request September 2 2019-09-06 17:10:35 +02:00
davidkartuzinski
34d1e11dec Readme to change image, and fix installation commands 2019-09-06 17:00:23 +02:00
Alexandre BODIN
5abcfc7865
Merge branch 'master' into develop 2019-09-06 16:51:23 +02:00
Alexandre Bodin
58063cf898 Add admin panel rebuild and before/after examples 2019-09-06 16:45:27 +02:00
Alexandre Bodin
2398df363b Add migration guide to beta.16 2019-09-06 11:36:53 +02:00
cyril lopez
106260da45
Merge pull request #3897 from strapi/front/qa 
Repeatable fields QA
 2019-09-04 16:22:27 +02:00
Virginie Ky
076db0a993 merge develop 2019-09-04 13:02:08 +02:00
Virginie Ky
1e450da9cc gst 2019-09-04 12:51:27 +02:00
Virginie Ky
b4854f583e groups reset 2019-09-04 12:37:07 +02:00
Virginie Ky
51d04a4c6b db reset 2019-09-04 12:35:17 +02:00
Virginie Ky
43ae44b480 CTB back button 2019-09-04 12:31:18 +02:00
Virginie Ky
5453a311fc some UI fixes 2019-09-03 21:15:32 +02:00
Shabab Karim
b70b3397fb Fixed issue with duplicate model folder getting created when generating model with api option 2019-09-03 16:32:34 +06:00
Virginie Ky
a3e044da87 leftmenu responsive ui 2019-09-03 12:29:12 +02:00
Alexandre Bodin
06a419a295 Removes resetToken from administrator edit view 2019-09-03 09:56:16 +02:00
Virginie Ky
746d7e0ca5 some UI fixes 2019-09-02 17:25:30 +02:00
Alexandre Bodin
9132ed970a Set content type mainField to be a string if possible else id 2019-09-02 12:15:01 +02:00
Alexandre BODIN
2cb834c610
Merge branch 'master' into fix/fr_template 2019-09-02 09:59:07 +02:00
cyril lopez
41113b56d8
Merge pull request #3858 from strapi/front/testing 
Front/testing
 2019-08-29 09:09:25 +02:00
Virginie Ky
44759c57d9 unit test fix 2019-08-28 18:05:39 +02:00
Virginie Ky
e57bed91a6 refetch data after delete content type 2019-08-28 17:53:40 +02:00
Virginie Ky
40c1a4fec7 jest config 2019-08-28 17:36:10 +02:00
Virginie Ky
16c4c9ebcd clean models 2019-08-28 17:20:53 +02:00
Virginie Ky
32236032b3 refetch data after delete feature 2019-08-28 17:14:00 +02:00
Virginie Ky
4b8e4566ae display feature delete button 2019-08-28 17:10:13 +02:00
Virginie Ky
5e0bec57d9 Content manager multiple select li ui 2019-08-28 16:57:44 +02:00
virginieky
eebf971182
Merge branch 'develop' into front/testing 2019-08-28 16:32:47 +02:00