yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,615 Commits 116 Branches 487 Tags
Commit Graph

385 Commits

Author SHA1 Message Date
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Aurélien GEORGET
7c2ab6eea5
Merge branch 'master' into fix/ctb-no-model-api 2018-01-10 13:29:26 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Николай
d120161831
Merge branch 'master' into master 2018-01-09 14:58:01 +03:00
Nikolay
d2fae1dfdc Mongoose updated to 5.0.0-rc1 2018-01-08 17:50:57 +03:00
Aurélien GEORGET
8a1b95f2b5
Merge branch 'master' into enhancement/one-way 2018-01-08 12:12:01 +01:00
Aurelsicoko
10db375825 Fix #379 - Support one-way relationship 2018-01-08 12:10:48 +01:00
Jim Laurie
cc4973b65b 3.0.0-alpha.7.3 2018-01-05 12:10:41 +01:00
Aurelsicoko
12d1357d36 Update behavior on plugin card and retrieve logo & description from API 2018-01-04 19:04:22 +01:00
Aurelsicoko
dafec67234 Merge branch 'master' of github.com:strapi/strapi into relation/users 2018-01-04 11:25:27 +01:00
cyril lopez
bc25ca3870 Fix typo 2017-12-18 15:18:03 +01:00
cyril lopez
c0e032969c Fix model entry count when deleting an entry and handle singular for entries number 2017-12-18 15:08:25 +01:00
cyril lopez
1b5a2396fb Add autoFocus to ctm edit view 2017-12-18 13:34:00 +01:00
cyril lopez
b619632662 Update branch 
Merge branch 'master' of github.com:strapi/strapi into relation/users
 2017-12-16 17:46:05 +01:00
Aurelsicoko
6d8b81ecbd Resolve conflicts 2017-12-16 17:08:58 +01:00
cyril lopez
0ff0b2e2aa Fix ctm editview backheader 2017-12-16 12:26:47 +01:00
Jim Laurie
5b6127876d 3.0.0-alpha.7.2 2017-12-15 15:04:31 +01:00
cyril lopez
5b542cff20 Fix left menu content manager links 2017-12-15 11:30:51 +01:00
Jim Laurie
1ab6ae71d8 3.0.0-alpha.7.1 2017-12-14 10:27:08 +01:00
Aurelsicoko
cbd1da155b Fix many-to-one association with Bookshelf 2017-12-13 15:30:03 +01:00
Aurelsicoko
1127ab1c85 Fix one-to-one during first creation with Bookshelf 2017-12-13 12:14:15 +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
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
Aurelsicoko
8db92c22fd Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose 2017-12-11 18:23:15 +01:00
Jim Laurie
6d39c26568 3.0.0-alpha.7 2017-12-11 15:11:29 +01:00
Aurelsicoko
d53287362a Fix source parameters to switch between content-type 2017-12-11 14:18:40 +01:00
Aurelsicoko
f9cc9b504c Delay admin load and handle relation between plugin and main models 2017-12-07 19:12:20 +01:00
Aurelsicoko
9409a39fc8 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 16:23:59 +01:00
Jim Laurie
ad15fbd8ad Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 16:16:58 +01:00
Jim Laurie
8ed108c012 Add filter fetch content type builder queries 2017-12-07 15:44:20 +01:00
cyril lopez
cba9cac629 Delete useless request file in ctm and order Auth controller by function s name 2017-12-07 15:21:54 +01:00
Jim Laurie
3f15a5b618 Fix bookshelf fetch for auth 2017-12-07 14:56:25 +01:00
Aurelsicoko
f5023b2fdc Use private data instead of state to send source to actions in Content Manager 2017-12-07 14:37:09 +01:00
Aurelsicoko
6f0396ea04 Remove unnecessary backend url from sagas' urls 2017-12-07 14:28:55 +01:00
cyril lopez
efc37c4b24 Fix ctm notification id 2017-12-07 13:26:25 +01:00
cyril lopez
a2ebbfab9e Handle any api errors in ctm 2017-12-06 15:58:20 +01:00
cyril lopez
ac102e88e5 Fix conflict 2017-12-06 15:15:43 +01:00
cyril lopez
59872ac890 Handle backend errors in ctm 2017-12-06 15:11:55 +01:00
Aurelsicoko
4444d806d6 Replace PNG logo to SVG & handle email/password type in Content Manager list 2017-12-06 13:44:58 +01:00
Aurelsicoko
110c209431 Be able to create an user from the Content Manager 2017-12-05 15:28:31 +01:00
Jim Laurie
80e4c1087c Fix conflict 2017-12-05 10:28:53 +01:00
cyril lopez
48d4150df2 Fix notif ctm 2017-12-04 17:52:16 +01:00
cyril lopez
4cb45e48be Fix design 2017-12-04 15:03:53 +01:00
Aurelsicoko
b195ae0ef8 Merge branch 'alpha.7' of github.com:strapi/strapi into user-permissions 2017-12-04 11:43:53 +01:00
cyril lopez
a7b56b484f Fix conflict 2017-11-29 19:00:51 +01:00
Aurelsicoko
d620a0745d Remove routing policy from /models route 2017-11-29 16:13:27 +01:00
Aurelsicoko
191092fca9 Redirect CM action to plugin's controller for User plugin 2017-11-29 16:10:13 +01:00
Aurelsicoko
8f8fa6b158 Update doc and generated template 2017-11-29 15:46:28 +01:00
Aurelsicoko
c971f9c054 Allow redirect action in CM & harmonize pre/post event with Promises 2017-11-29 15:00:50 +01:00