yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 02:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 115 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
78c2b252cd Fix find users 2017-12-14 16:29:13 +01:00
cyril lopez
55d839113d Fix stm add language bug 2017-12-14 16:28:51 +01:00
Jim Laurie
22a7e91036 Fix get user info link in search list 2017-12-14 16:15:32 +01:00
Jim Laurie
2715f2693f Check if token user still exist 2017-12-14 16:12:39 +01:00
Jim Laurie
c7ef225238 Replace id to _id for fetch user mongoose 2017-12-14 15:14:53 +01:00
Aurelsicoko
4bdfddaca8 Clean relation model user 2017-12-14 14:13:06 +01:00
Jim LAURIE
5962052287
Merge pull request #377 from strapi/3.0.0-alpha.7.1 
3.0.0-alpha.7.1
 2017-12-14 14:08:53 +01:00
Jim Laurie
1ab6ae71d8 3.0.0-alpha.7.1 2017-12-14 10:27:08 +01:00
cyril lopez
b541e6cc4f Fix conflict 2017-12-13 16:47:35 +01:00
cyril lopez
1ef46dffea Get plugins models and adapt from to display plugins models 2017-12-13 16:41:49 +01:00
Jim LAURIE
f39a675690
Merge pull request #376 from strapi/fix/gitignore 
Fix .gitignore file generation
 2017-12-13 16:33:33 +01:00
Aurelsicoko
859e2985c8 Fix many-to-many association with Bookshelf 2017-12-13 16:28:50 +01:00
Jim Laurie
feb0fd3931 Merge branch 'master' of https://github.com/strapi/strapi into fix/gitignore 2017-12-13 16:16:48 +01:00
Jim LAURIE
bd2ea33de6
Merge pull request #375 from strapi/update/roadmap 
Update ROADMAP
 2017-12-13 16:15:47 +01:00
Jim Laurie
3685878d82 Merge branch 'master' of https://github.com/strapi/strapi into update/roadmap 2017-12-13 15:57:34 +01:00
Jim LAURIE
ce2e79b08e
Merge pull request #373 from strapi/update-getting-started-doc 
Update getting started doc
 2017-12-13 15:56:48 +01:00
Jim Laurie
fffb7af2e4 Merge branch 'master' of https://github.com/strapi/strapi into update-getting-started-doc 2017-12-13 15:43:16 +01:00
Jim LAURIE
3695cada33
Merge pull request #372 from strapi/fix/documentation-links 
Add authentification link in doc menu
 2017-12-13 15:40:43 +01:00
Aurelsicoko
cbd1da155b Fix many-to-one association with Bookshelf 2017-12-13 15:30:03 +01:00
cyril lopez
c6d74d58f0 Add plugins models to ctb and fix navigation 2017-12-13 15:22:16 +01:00
Jim Laurie
08411082b8 Merge branch 'master' of https://github.com/strapi/strapi into fix/documentation-links 2017-12-13 15:19:55 +01:00
Jim Laurie
d089f3fe29 Fix PR feedback 2017-12-13 15:17:40 +01:00
Jim Laurie
cc4e1bd762 Merge branch 'master' of https://github.com/strapi/strapi into update-getting-started-doc 2017-12-13 15:15:56 +01:00
Jim LAURIE
8cc616f6b6
Merge pull request #374 from strapi/improve-user-edit-section 
Improve UX when editing a role
 2017-12-13 15:15:10 +01:00
Aurelsicoko
a6bd10cf11 Update ROADMAP 2017-12-13 14:50:56 +01:00
Aurelsicoko
74e1f0529d Fix specific case in one-to-one relation 2017-12-13 14:36:07 +01:00
Jim Laurie
f9126e5f0d Fix .gitignore file generation 2017-12-13 14:23:07 +01:00
cyril lopez
13383d9f7c Open the application s permissions section if there are APIs 2017-12-13 13:43:36 +01:00
cyril lopez
0a2165f97f Fix typo 2017-12-13 13:37:11 +01:00
cyril lopez
4028e5c88f Update getting started 2017-12-13 13:24:46 +01:00
cyril lopez
a641b8ec93 Update contributing guide 2017-12-13 12:21:16 +01:00
Aurelsicoko
1127ab1c85 Fix one-to-one during first creation with Bookshelf 2017-12-13 12:14:15 +01:00
cyril lopez
b0fcdc4a91 Create OverlayBlocker documentation 2017-12-13 11:49:26 +01:00
Aurelsicoko
b08a4d811c Use local global to expose model for Bookshelf & move globalId definition in the core 2017-12-13 11:38:38 +01:00
Jim Laurie
e80ce765af Change alpha version 2017-12-13 11:24:51 +01:00
Jim LAURIE
348b4d1b27
Merge pull request #366 from strapi/fix-login-redirect 
Prevent user from going to login page if no user is registered
 2017-12-13 11:12:14 +01:00
Jim Laurie
56708f7cd8 Add authentification link in doc menu 2017-12-13 11:04:44 +01:00
cyril lopez
d843886696 Update branch 
Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect
 2017-12-13 10:59:12 +01:00
Aurélien GEORGET
0aef60b57c
Merge pull request #369 from lucaperret/master 
Fix generate-controller templates: typo on method
 2017-12-13 10:44:21 +01:00
cyril lopez
09d4183f1e Update branch 
Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect
 2017-12-13 10:41:06 +01:00
cyril lopez
8774f365aa Display info box when downkloading a plugin 2017-12-12 20:17:41 +01:00
cyril lopez
9fe1480a26 Created OverlayBlocker that prevents any action on the app and add download plugin dynamic 2017-12-12 19:53:04 +01:00
cyril lopez
43bfb8593e Connect container to real data 2017-12-12 18:30:09 +01:00
Luca Perret
a18434faa0 Fix generate-controller templates: typo on method 2017-12-12 18:22:07 +01:00
cyril lopez
f32ecc6828 Created StarsContainer component 2017-12-12 17:49:06 +01:00
cyril lopez
54034bba6f Add nav links 2017-12-12 17:05:43 +01:00
Aurelsicoko
a47d99efd4 Display ID for SQL databases 2017-12-12 16:27:29 +01:00
Aurelsicoko
61d75648b0 Fix content-manager offset for SQL databases 2017-12-12 16:24:19 +01:00
cyril lopez
01dcc8dada Finish design install plugin pop up 2017-12-12 16:18:48 +01:00
Jim LAURIE
58f4e4667d
Merge pull request #367 from strapi/fix/roles 
Fix auto set config if doent exist
 2017-12-12 16:14:42 +01:00