yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 120 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Broc Gailit
ad0511fdd2
Merge branch 'master' into master 2018-06-28 19:06:03 -07:00
cyril lopez
f857f2be8b Apply settings in list view 2018-06-28 18:39:36 +02:00
cyril lopez
cc49c29f99 Update recursively schema on change 2018-06-28 17:54:24 +02:00
Jim LAURIE
5a5cc6bd8a
Merge pull request #1399 from strapi/tests/split 
Split tests by packages and add tests for oneWay relationship.
 2018-06-28 14:07:21 +02:00
Jim LAURIE
241ff40ebb Have to fix null vs empty object 2018-06-28 13:58:54 +02:00
cyril lopez
c0c99d443a Fix conflicts and add pt.json translation files in usr-perm plugin 2018-06-28 12:54:39 +02:00
cyril lopez
f152e0cac8 Add ctm in plugins container and add its icon in pluginsPage. 
Change LeftMenu to functionnal component
 2018-06-28 12:49:26 +02:00
cyril lopez
2bd990794e Fix content-manager with new data type 2018-06-28 12:27:15 +02:00
Jim LAURIE
7e194662cf Merge branch 'master' of github.com:strapi/strapi into tests/split 2018-06-28 12:21:07 +02:00
Jim LAURIE
4b66199ef2 Enable all tests 2018-06-28 12:19:00 +02:00
Jim LAURIE
19821a93dd Remove boolean attribute 2018-06-28 12:18:21 +02:00
cyril lopez
b396b29624 Fix ListView with new data 2018-06-28 12:12:54 +02:00
cyril lopez
799c6c3f0f Remove webpack warnings and react-intl errors 2018-06-28 10:01:59 +02:00
cyril lopez
f09cace582 Remove JSON & Wysiwyg from helper-plugin and move them to content-manager 2018-06-28 09:46:10 +02:00
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