yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-27 02:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 116 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
10bf271b1c
Merge pull request #2914 from strapi/events 
Set events in the front-end
 2019-03-08 15:57:03 +01:00
Jim LAURIE
73b31d4e27
Merge branch 'master' into events 2019-03-08 15:56:50 +01:00
soupette
8cb39d8e81 Design modelPage 2019-03-08 15:55:15 +01:00
Jim LAURIE
be36c280f3 Fix lint 2019-03-08 15:53:58 +01:00
davidkartuzinski
698a6d2ad8 Fix conflicts 2019-03-08 15:35:00 +01:00
Jim LAURIE
d6942f2625
Merge pull request #2850 from rsinelle/master 
Return bad request in case of empty files attribut
 2019-03-08 15:19:25 +01:00
Jim LAURIE
b8edcbc283
Merge branch 'master' into master 2019-03-08 15:18:56 +01:00
davidkartuzinski
8bf31d8f27 Corrected typos and made changes as recommended by Yves. 2019-03-08 15:18:46 +01:00
Jim LAURIE
0071d28f22 Move error message to translation 2019-03-08 14:56:09 +01:00
Jim LAURIE
a5ce7bca4e
Merge pull request #2812 from gilhardl/fix-2731 
Fix $pull error deleting entry with dominant model of many-to-many relation
 2019-03-08 13:47:22 +01:00
Jim LAURIE
90d67ef4cf
Merge branch 'master' into fix-2731 2019-03-08 10:19:36 +01:00
REDDY PRASAD
786e1e00f7 🐛 Fix 'non-constant default' error while addind timestamp field to existing sqlite3 table 2019-03-08 11:33:47 +05:30
Amin Zibayi
e469081e52
Add necessary spaces before the list items 2019-03-08 01:27:27 +03:30
Amin Zibayi
d23c2e40e4
Add more necessary spaces before the list items 2019-03-08 01:12:36 +03:30
Amin Zibayi
85abbea57d
Add necessary spaces before the list items 2019-03-08 01:03:36 +03:30
soupette
533c8fed0d Init attributes list 2019-03-07 17:54:50 +01:00
Jim LAURIE
f2bac2a59a
Merge pull request #2633 from abdonrd/patch-1 
Update graphql dependency to v14.1.0
 2019-03-07 17:51:55 +01:00
Jim LAURIE
241ba857d8
Merge branch 'master' into patch-1 2019-03-07 17:51:39 +01:00
soupette
b6907e6f10 Fix PR feedback 2019-03-07 16:06:02 +01:00
Jim LAURIE
a98756504d
Merge pull request #2943 from strapi/fix/2530 
Fix for SQL Mutation Updates
 2019-03-07 15:55:54 +01:00
Jim LAURIE
d22bc090f1
Merge branch 'master' into fix/2530 2019-03-07 15:55:14 +01:00
soupette
222333067c Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb 2019-03-07 15:43:10 +01:00
soupette
f926b8dc2e Add loader 2019-03-07 15:42:51 +01:00
Jim LAURIE
9d439e00a0
Merge pull request #2901 from strapi/improve/blockerComponent 
Improve OverlayBlocker when server error
 2019-03-07 15:11:04 +01:00
Jim LAURIE
8d01b9380c
Update 30s to 15s 2019-03-07 15:10:09 +01:00
Jim LAURIE
b6bdf6f7ce
Merge branch 'master' into improve/blockerComponent 2019-03-07 14:38:40 +01:00
Jim LAURIE
af11222622
Merge pull request #2859 from dev-drprasad/add-granularity-of-max-size-upload-for-file-upload 
Add granularity of 'max size upload' for file upload (< 1MB)
 2019-03-07 14:37:00 +01:00
Jim LAURIE
26ac833855
Merge branch 'master' into add-granularity-of-max-size-upload-for-file-upload 2019-03-07 14:36:32 +01:00
Jim LAURIE
f1f4728d29
Merge pull request #2706 from brinley/patch-2 
Updated notifications container position to fixed
 2019-03-07 14:35:59 +01:00
Ky
359fdede29 merge 2019-03-07 14:30:09 +01:00
Ky
86f9f2fc41 HomePage with model removing 2019-03-07 14:28:50 +01:00
Jim LAURIE
cfd8e4414b
Merge branch 'master' into patch-2 2019-03-07 14:26:36 +01:00
davidkartuzinski
fdce979c31 I made the changes. Changed images, etc. 2019-03-07 14:16:22 +01:00
Jim LAURIE
768ad2ffcd
Merge pull request #2664 from derrickmehaffy/enhancement/bigint 
Add Big Integer to adminUI
 2019-03-07 13:53:58 +01:00
Jim LAURIE
8241863444
Merge branch 'master' into enhancement/bigint 2019-03-07 13:42:16 +01:00
soupette
a35d402bde Created commonPropTypes folder to avoid code duplication 2019-03-07 11:39:55 +01:00
DMehaffy
8a20a151d0 Temporary fix for SQL Mutation Updates 2019-03-07 02:54:19 -07:00
Jim LAURIE
6db92eb17b
Merge pull request #2909 from EpicUsaMan/patch-5 
Fix for UPPERCASE / camelCase names
 2019-03-07 10:20:03 +01:00
Jim LAURIE
2422e3c87b
Merge branch 'master' into patch-5 2019-03-07 10:19:30 +01:00
soupette
38071a8123 Add pluginHeader 2019-03-06 19:20:27 +01:00
soupette
b4b025cd17 Display menu in modelPage 2019-03-06 18:50:52 +01:00
Jim LAURIE
5924ed2f5d
Merge pull request #2918 from strapi/enhancement/file-email-provider-orga 
Manage email and upload providers from an npm organisation
 2019-03-06 18:02:04 +01:00
Jim LAURIE
84d50b78c1
Merge branch 'master' into enhancement/file-email-provider-orga 2019-03-06 18:01:42 +01:00
Jim LAURIE
d352948639
Merge pull request #2916 from strapi/fix/confirm-email-token 
Remove token from register route if confirm email is required
 2019-03-06 17:58:18 +01:00
Jim LAURIE
8640864b71
Merge branch 'master' into fix/confirm-email-token 2019-03-06 17:57:52 +01:00
Jim LAURIE
eb70b66e01
Merge pull request #2915 from strapi/fix/confirmation-email-bad-token 
Fix bad token for confirmation link
 2019-03-06 17:57:35 +01:00
Jim LAURIE
d5da04cfe4
Merge branch 'master' into fix/confirmation-email-bad-token 2019-03-06 17:57:26 +01:00
Ky
9f0f6859ba merge 2019-03-06 17:07:28 +01:00
Ky
b31017ee77 HomePage in progress 2019-03-06 17:03:30 +01:00
soupette
e2de03a862 Init ModelPage and prepare menu 2019-03-06 16:43:20 +01:00