yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 115 Branches 488 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
4aa46c5d0f Store config in core_store 2018-06-28 09:31:17 +02:00
cyril lopez
039d9e5856 Front-end config in core-store 2018-06-27 19:00:19 +02:00
Jim LAURIE
4d895e649e
Merge pull request #1456 from Arccil/language-pt 
Portuguese Language Support
 2018-06-27 15:18:33 +02:00
Jim LAURIE
c5f1b8507e
Merge branch 'master' into language-pt 2018-06-27 14:51:17 +02:00
Jim LAURIE
157c249382 Merge branch 'master' of github.com:strapi/strapi into tests/split 2018-06-27 14:28:30 +02:00
Abdón Rodríguez Davila
f261ee4802 Don't use MongoDB connectOptions when using URI 2018-06-27 13:13:34 +02:00
Jim LAURIE
4becad13f1
Merge pull request #1471 from strapi/3.0.0-alpha.12.6 
3.0.0-alpha.12.6
 2018-06-27 09:16:04 +02:00
Jim LAURIE
534b17f77f 3.0.0-alpha.12.6 v3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
Kamal Bennani
25eab80f64
Correctly detect an enum field 2018-06-26 18:23:18 +02:00
Broc Gailit
9226147e7c
Merge branch 'master' into master 2018-06-26 08:20:07 -07:00
Jim LAURIE
b0c67a1beb
Merge pull request #1470 from strapi/fix-policy 
Fix empty string not require for policy
 2018-06-26 17:19:32 +02:00
Jim LAURIE
561e910558
Fix empty string not require 2018-06-26 17:14:42 +02:00
Jim LAURIE
0adea6dd6c
Merge pull request #1436 from strapi/fix-json-sql 
Fix JSON type format SQL
 2018-06-26 15:44:36 +02:00
Jim LAURIE
670f34d64a
Merge branch 'master' into fix-json-sql 2018-06-26 14:28:32 +02:00
Jim LAURIE
b186cad7e9 PR feedback 2018-06-26 14:18:31 +02:00
Jim LAURIE
2f882faf1e Use longtext 2018-06-26 13:42:14 +02:00
Jim LAURIE
60a7e99d11
Merge pull request #1437 from johannpinson/patch-sql-timezone 
Fix default timezone to UTC for SQL database
 2018-06-26 13:40:41 +02:00
Jim LAURIE
a686949d55
Merge branch 'master' into patch-sql-timezone 2018-06-26 13:28:53 +02:00
Alberto Maturano
10b2c00de9 Fix code linter error 2018-06-25 16:05:14 -05:00
Alberto Maturano
a363f55312 Change hardcoded "tmp" path to an OS-random one 
Change the fixed temporary path to a random one in the OS temp
directory.

Fixes #1463
Related #632
 2018-06-25 13:36:06 -05:00
Johann Pinson
1372e40ff2
feat(readme): update badge + requirements 2018-06-25 10:46:56 +02:00
Kamal Bennani
aedf09bdcb
Add Enum and DateTime support in aggregation and drop lodash 2018-06-25 06:50:16 +02:00
Jim LAURIE
5a156adf8b
Merge pull request #1445 from strapi/fix-delete-sql 
Fix delete SQL entry with relation
 2018-06-23 16:49:30 +02:00
Jim LAURIE
620ffefa52
Merge branch 'master' into fix-delete-sql 2018-06-23 16:32:41 +02:00
Jim LAURIE
6d895a3ea9
Merge pull request #1447 from strapi/enhance/input-json 
Enhance input JSON
 2018-06-23 16:18:18 +02:00
Jim LAURIE
6af4a38986
Merge branch 'master' into enhance/input-json 2018-06-23 15:53:06 +02:00
Jim LAURIE
25c93c5c98
Merge pull request #1446 from pierreburgy/master 
Fix ssl interpretation for Mongo connection
 2018-06-23 15:40:04 +02:00
Faustino Kialungila
c8a74b9e69 Portuguese Language Support 2018-06-23 12:11:20 +02:00
cyril lopez
00f5af980e Fix project création in dev mode 2018-06-22 16:46:48 +02:00
Jim LAURIE
f6f077a996 Review app start logs 2018-06-22 16:28:54 +02:00
Jim LAURIE
7bcebb3caa Review generate app logs 2018-06-22 15:25:15 +02:00
cyril lopez
41ebaa36e8 Remove yarn check when creating an application in dev mode 2018-06-22 15:07:12 +02:00
cyril lopez
f056c44dd6 Fix conflicts 2018-06-22 14:17:32 +02:00
Pierre Burgy
f0a8b03e73 Fix ssl interpretation for mongo connection 2018-06-22 12:05:17 +02:00
Broc Gailit
81ccc526bc
Merge branch 'master' into master 2018-06-21 18:44:40 -07:00
Jim LAURIE
bde30af875 Fix delete SQL entry with relations fix #1419 2018-06-21 19:42:03 +02:00
cyril lopez
48a2afe6bd Fix strapi-helper-lint 2018-06-21 15:28:49 +02:00
soupette
e1790c31ef Manage to install strapi with yarn 2018-06-21 15:07:50 +02:00
Aurelsicoko
0b1241300c Update CSS & improve error management 2018-06-21 13:06:52 +02:00
Jim LAURIE
54dd920861
Merge pull request #1438 from strapi/doc-poly-update 
Update polymorphic ref link
 2018-06-21 11:42:36 +02:00
Jim LAURIE
b2d545edac
Merge branch 'master' into doc-poly-update 2018-06-21 11:33:42 +02:00
Johann Pinson
e146939c8e docs(database): add information about timezone settings for SQL databases 2018-06-21 10:17:30 +02:00
Jim LAURIE
b7fe5f7821 Optimize code 2018-06-20 20:47:45 +02:00
Johann Pinson
6bbc5c8993 fix(datetime): add datetime and timestamp detection 2018-06-20 19:09:37 +02:00
Aurélien GEORGET
37e989b52c
Update models.md 2018-06-20 18:50:49 +02:00
Jim LAURIE
b02c662666 Update Readme 2018-06-20 18:37:12 +02:00
Jim LAURIE
1d071db90d
Merge pull request #1410 from strapi/add-loader 
Add loading status in the admin panel
 2018-06-20 17:11:49 +02:00
Jim LAURIE
6509ef884c Update polymorphic ref link 2018-06-20 17:03:10 +02:00
Johann Pinson
d9f5af24d5 fix(admin): change timezone manager from admin when db is sql 2018-06-20 16:49:21 +02:00
Broc Gailit
da319dcb25
Merge branch 'master' into master 2018-06-20 07:31:34 -07:00