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
Johann Pinson
8a5e4c48ad
fix(upload): improve query find for bookshelf 2018-07-03 12:09:49 +02:00
cyril lopez
889c771b5c Change routing 2018-07-02 17:05:29 +02:00
Jim LAURIE
d383a75154 Handle yarn install in generated project 2018-07-02 17:00:44 +02:00
cyril lopez
6e6657fbe1 Merge master 2018-07-02 16:00:00 +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
Broc Gailit
eb74b7e4e2
Merge branch 'master' into master 2018-07-01 09:41:04 -07: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
cyril lopez
cea3dee851 Add drag and drop to sort list header. 
Needs design
Need to be able to remove or add an attribute
 2018-06-29 17:20:36 +02:00
cyril lopez
7a9b3f6d59 Fix lint 2018-06-29 15:40:55 +02:00
cyril lopez
3adaf8cdcc Apply list settings in listView 2018-06-29 15:33:58 +02:00
cyril lopez
4393511aab Created SettingPage container and add the form to modify the default settings per content type 2018-06-29 15:07:15 +02:00
cyril lopez
d5259985fd Desgin settings-page ctm 2018-06-29 12:29:31 +02:00
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