yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-19 07:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 115 Branches 484 Tags
Commit Graph

211 Commits

Author SHA1 Message Date
Juampy
32095d08c5 Fix invalid timestamp default values for MySQL 5.7 2018-04-18 19:01:19 +02:00
Jim Laurie
ebd144fddb 3.0.0-alpha.12 2018-04-18 12:03:16 +02:00
cyril lopez
77bc3975c4
Merge branch 'master' into reduce-setup-monorepo 2018-04-18 11:54:36 +02:00
soupette
fcc374c3fd Fix conflicts 2018-04-17 11:50:52 +02:00
soupette
7b87af5e1b Remove prebuild test and update documentation 2018-04-17 11:49:09 +02:00
Jim LAURIE
c0ea8fa807
Merge branch 'master' into graphql 2018-04-16 16:39:50 +02:00
Administrator
147f614c09 Russian language for Upload plugin 2018-04-15 20:13:23 +03:00
Aurelsicoko
87b07c8eeb Resolve conflicts 2018-04-13 18:04:03 +02:00
Aurelsicoko
058c84d61e Fix float & decimal number on Mongoose 2018-04-13 18:02:37 +02:00
Jim Laurie
3b7de09362 Fix upload count page 2018-04-13 15:42:45 +02:00
Aurelsicoko
0ac7c435f3 Merge branch 'master' of github.com:strapi/strapi into graphql 2018-04-12 16:37:23 +02:00
Aurelsicoko
73764d6ae0 Add containss in Bookshelf filters 2018-04-12 15:44:04 +02:00
Aurelsicoko
78234fab61 Support contains sensitive filter and fix Bookshelf queries 2018-04-10 18:54:01 +02:00
Aurelsicoko
26be155f09 Await promises before returning values 2018-04-10 12:56:13 +02:00
soupette
81109f558e Fix conflict 2018-04-10 11:18:04 +02:00
Luca Perret
19f0494650 feat(plugin-upload): adding findOne endpoint 2018-04-09 19:31:49 +02:00
Jan Brach
0efdd3a0b4
Merge branch 'master' into master 2018-04-06 17:25:00 +02:00
Jan Brachhold
1408b760d9 Fix typo 2018-04-06 16:27:13 +02:00
Jan Brachhold
51b7a93832 Improve german translation 2018-04-06 15:54:02 +02:00
Aurelsicoko
0f581fa5c3 Be able to retrieve polymorphic association using GraphQL (File Upload) 2018-04-05 15:20:24 +02:00
Jim Laurie
ee12536e84 3.0.0-alpha.11.3 2018-04-05 14:13:50 +02:00
soupette
86bc73e9d1 Fix conflict 2018-04-02 09:50:58 +02:00
Inder Redni
1e914be7b7 polish language | update 2018-03-30 19:00:06 +02:00
soupette
0c8769138c Fix conflict 2018-03-30 13:00:03 +02:00
soupette
4ddd4302cf Fixes #832 2018-03-29 16:25:47 +02:00
Jim Laurie
8390106f59 3.0.0-alpha.11.2 2018-03-27 17:59:16 +02:00
Jim Laurie
6cd0ec730e 3.0.0-alpha.11.1 2018-03-11 15:54:56 +01:00
Jim LAURIE
1d91544b4f
Merge branch 'master' into fix-upload 2018-03-09 13:08:33 +01:00
cyril lopez
5542d32941 Fixes #759 2018-03-09 11:22:37 +01:00
Jim Laurie
932bf6da23 3.0.0-alpha.11 2018-03-08 17:31:25 +01:00
Jim Laurie
ce3deaf862 Fix dependencies upload provider 2018-03-08 12:14:51 +01:00
cyril lopez
589d3f5a3f Fix app environments bug 2018-03-08 10:32:01 +01:00
cyril lopez
e848b3a091 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-07 18:01:21 +01:00
cyril lopez
bb65ff70da Fix upload update 
Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>
 2018-03-07 17:48:40 +01:00
Jim Laurie
8b6a52dbff Replace index action name 2018-03-07 16:25:56 +01:00
Aurelsicoko
74ee186be2 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-07 15:45:54 +01:00
cyril lopez
7fe96d3875 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-07 15:16:11 +01:00
cyril lopez
ea2a9237be Created EditPage container 2018-03-07 15:13:54 +01:00
Aurelsicoko
fdb37a101b Update copied link style and update menu link Users & Permissions 2018-03-07 14:45:09 +01:00
Jim Laurie
ed63df0ae6 Fix delete file on aws s3 2018-03-07 14:18:15 +01:00
Aurelsicoko
1ee852c485 Fix upload providers loading 2018-03-07 11:26:53 +01:00
Aurelsicoko
fc53de4631 Only execute SQL query for SQL database 2018-03-07 10:01:58 +01:00
Aurelsicoko
c6ebabccd3 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-06 18:33:50 +01:00
Aurelsicoko
8904f2ef60 Improve animation upload timing 2018-03-06 18:32:39 +01:00
Jim Laurie
5cbfa32d48 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-06 16:52:29 +01:00
Aurelsicoko
b89a8a5abc Display better logs 2018-03-06 16:51:00 +01:00
Jim Laurie
2da0a339a9 Search case in-sensitive 2018-03-06 16:24:16 +01:00
Aurelsicoko
800945eb32 Resolve conflicts 2018-03-06 15:50:41 +01:00
Aurelsicoko
cc1ec5c1ea Make CSS improvements on upload plugin 2018-03-06 15:49:11 +01:00
cyril lopez
e4e65658e6 Add animation when uploading files 2018-03-06 14:02:56 +01:00