yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 05:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 117 Branches 489 Tags
Commit Graph

5041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
f2f06cd966 Merge branch 'yarn-install' of github.com:strapi/strapi into yarn-install 2018-07-03 17:10:40 +02:00
Jim LAURIE
74adea6a40
Merge branch 'master' into yarn-install 2018-07-03 17:10:00 +02:00
Jim LAURIE
13013a40b4 Improve find npm global strapi performance 2018-07-03 16:43:08 +02:00
Jim LAURIE
7ab5d0ed69
Merge pull request #1500 from brinley/patch-1 
Fixed incorrect import for utils/request
 2018-07-03 14:39:06 +02:00
Jim LAURIE
d383a75154 Handle yarn install in generated project 2018-07-02 17:00:44 +02:00
Jim LAURIE
eff46b5cb1 Not clear oneWay relation on model update fix #1477 2018-07-02 15:41:53 +02:00
cyril lopez
ed89c8404d Fix install 2018-07-02 14:59:50 +02:00
Brinley Ang
085edd4136
Fixed incorrect import for utils/request 2018-07-02 18:37:00 +10: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
Jim LAURIE
cd41c663e6
Merge pull request #1475 from abdonrd/patch-1 
Don't use MongoDB connectOptions when using URI
 2018-07-01 21:22:50 +02: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
3451fb6b1d
Merge pull request #1464 from maturano/bug/1463_tmpPath 
Change hardcoded "tmp" path to an OS-random one
 2018-07-01 13:59:01 +02:00
Jim LAURIE
77b08c5d5d
Merge branch 'master' into bug/1463_tmpPath 2018-07-01 13:42:53 +02:00
Daniel Ruf
5c5ca6818c
chore: trigger new build 2018-06-30 18:15:30 +02:00
Daniel Ruf
5a54d7c2a2
fix: Do not cleanup directories 2018-06-30 18:09:22 +02:00
Daniel Ruf
9fd5bad422
chore: cache dependencies 2018-06-30 17:45:12 +02:00
Jim LAURIE
a675b503d5
Merge pull request #1487 from maturano/bug/documentation 
Fix filename reference
 2018-06-30 16:01:27 +02:00
Alberto Maturano
5a25cee384 Fix filename reference 2018-06-29 12:13:59 -05: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
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
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
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