yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-09 23:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,985 Commits 104 Branches 503 Tags
Commit Graph

3653 Commits

Author SHA1 Message Date
Jim LAURIE
ae58979892
Merge branch 'master' into language-pt_BR 2018-07-03 17:52:04 +02:00
Jim LAURIE
383538e44b
Merge branch 'master' into review-logs 2018-07-03 17:35:08 +02:00
Jim LAURIE
eff46b5cb1 Not clear oneWay relation on model update fix #1477 2018-07-02 15:41:53 +02:00
Carlos Guimaraes
07b8521d32
Merge branch 'master' into language-pt_BR 2018-07-01 18:49:20 -03:00
Carlos Guimaraes
dff877eb41
Brazilian Portuguese Language Support 2018-07-01 17:25:43 -03:00
Carlos Guimaraes
46765b442c
Brazilian Portuguese Language Support 2018-07-01 17:24:47 -03:00
Carlos Guimaraes
c64720abb3
Brazilian Portuguese Language Support 2018-07-01 17:23:47 -03:00
Carlos Guimaraes
fe87d4f710
Brazilian Portuguese Language Support 2018-07-01 17:23:02 -03:00
Carlos Guimaraes
57cffecc4a
Brazilian Portuguese Language Support 2018-07-01 17:21:59 -03:00
Carlos Guimaraes
9698c7d036
Brazilian Portuguese Language Support 2018-07-01 17:21:13 -03:00
Carlos Guimaraes
e3f745e53c
Brazilian Portuguese Language Support 2018-07-01 17:20:17 -03:00
Carlos Guimaraes
4fe5721ed8
Brazilian Portuguese Language Support 2018-07-01 17:15:34 -03:00
Carlos Guimaraes
6b5f0f3b7a
Brazilian Portuguese Language Support 2018-07-01 16:50:54 -03:00
Abdón Rodríguez Davila
3b0770868c Check if URI 2018-07-01 19:20:53 +02:00
Abdón Rodríguez Davila
6fca22a339 Refactor URI options 2018-07-01 18:53:21 +02:00
Abdón Rodríguez Davila
f19e9e98c1 Override connectOptions with URI params 2018-07-01 18:47:33 +02:00
Abdón Rodríguez Davila
3efb086aa0 Revert "Don't use MongoDB connectOptions when using URI" 
This reverts commit f261ee480294a4db9fc0b73fea602951458f4e55.
 2018-07-01 18:11:11 +02:00
Abdón Rodríguez Davila
62125a08c4 Merge branch 'master' into patch-1 2018-07-01 18:09:59 +02:00
Jim LAURIE
77b08c5d5d
Merge branch 'master' into bug/1463_tmpPath 2018-07-01 13:42:53 +02:00
Jim LAURIE
241ff40ebb Have to fix null vs empty object 2018-06-28 13:58:54 +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
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
534b17f77f 3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
Jim LAURIE
561e910558
Fix empty string not require 2018-06-26 17:14:42 +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
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
Jim LAURIE
620ffefa52
Merge branch 'master' into fix-delete-sql 2018-06-23 16:32:41 +02:00
Jim LAURIE
6af4a38986
Merge branch 'master' into enhance/input-json 2018-06-23 15:53:06 +02:00
Faustino Kialungila
c8a74b9e69 Portuguese Language Support 2018-06-23 12:11:20 +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
Pierre Burgy
f0a8b03e73 Fix ssl interpretation for mongo connection 2018-06-22 12:05:17 +02: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
Aurelsicoko
0b1241300c Update CSS & improve error management 2018-06-21 13:06:52 +02:00
Jim LAURIE
b7fe5f7821 Optimize code 2018-06-20 20:47:45 +02:00
Johann Pinson
d9f5af24d5 fix(admin): change timezone manager from admin when db is sql 2018-06-20 16:49:21 +02:00
Jim LAURIE
75c1c4bac5 Fix JSON type format SQL fix #1425 2018-06-20 16:21:09 +02:00
cyril lopez
6f156144b5
Merge branch 'master' into add-loader 2018-06-20 15:15:34 +02:00
Jim LAURIE
c93fef17dc
Merge branch 'master' into input-json 2018-06-20 12:28:59 +02:00
Jim LAURIE
9be5655d00 Fix PR feedback 2018-06-20 12:19:58 +02:00
Jim LAURIE
2761f3949f
Merge branch 'master' into master 2018-06-20 09:33:30 +02:00
Alessio Koci
c8f9b2f07c fix directories structure 2018-06-20 09:31:25 +02:00
mathb67
1576da293f
Merge branch 'master' into master 2018-06-19 18:13:00 +02:00