yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-22 23:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 121 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abdón Rodríguez Davila
8d62ff81d5
Merge branch 'master' into fix-gae-deploy 2019-01-02 11:00:46 +01:00
Jim LAURIE
60803dccfb
Merge pull request #2569 from strapi/2019 
Update to 2019
 2019-01-02 09:45:08 +01:00
Jim LAURIE
45bcaf770b Update to 2019 2019-01-02 09:41:53 +01:00
Justin Greene
9755836c5d
Update inquirer to fix windows hang 2018-12-30 18:17:58 -06:00
Justin Greene
3950503acf
Update inquirer to fix windows console freezing 2018-12-30 18:17:05 -06:00
Pierre Burgy
fddf391e84 Add SQLite support 2018-12-29 21:35:07 +01:00
Paolo Ragone
8a7aea1ce3
Merge branch 'master' into patch-1 2018-12-29 19:42:01 +13:00
Jim LAURIE
31626ae14e Add documentation 2018-12-28 17:05:16 +01:00
Jim LAURIE
6de05cbdad Add debug option on strapi new 2018-12-28 16:51:02 +01:00
Jim LAURIE
080fd1721b In dev mode use local connectivity script 2018-12-28 14:59:45 +01:00
Chaitanya Choudhary
1c4aafae5b Fixed conditional statement for hasTimestamps 2018-12-28 19:24:24 +05:30
Chaitanya Choudhary
6835fdf426 Handle different types of timestamp values 2018-12-28 17:04:36 +05:30
Abdón Rodríguez Davila
042bc15c30
Merge branch 'master' into fix-gae-deploy 2018-12-28 11:17:24 +01:00
Chaitanya Choudhary
b04ba69370 Ability to use custom timestamps. 2018-12-28 14:17:12 +05:30
Jim LAURIE
39bcc6a593
Merge pull request #2544 from AminZibayi/patch-1 
Fix a typo in concepts documentation
 2018-12-26 19:35:38 +01:00
Amin Zibayi
afe6d60c01
Fix a typo in concepts documentation 2018-12-26 18:54:03 +03:30
Jim LAURIE
1d4a0b3edd
Merge pull request #2542 from strapi/lauriejim-patch-1 
Update middleware documentation enable
 2018-12-26 14:37:46 +01:00
Jim LAURIE
f123639edf
Update middleware documentation enable 2018-12-26 14:36:49 +01:00
Jim LAURIE
24db8ef868 Add JS query example in relation documentation 2018-12-26 12:30:52 +01:00
Chaitanya Choudhary
230a8af1f7 Force attribute not required in database object. 2018-12-26 13:50:53 +05:30
Paolo Ragone
947dd2b502 Added missing semicolon 2018-12-26 12:11:12 +13:00
Paolo Ragone
382722b74c
Fix provider query building bug 
Fixes #2536
Does so by fixing the parameters to the query call
 2018-12-26 11:10:35 +13:00
Chaitanya Choudhary
cf713b2c58 Add force option when database not empty with bookshelf 2018-12-24 15:39:51 +05:30
Jim LAURIE
e4dc27be54
Merge pull request #2465 from gianca970226/master 
Fix so you can choose multiple domains for the cors
 2018-12-23 21:03:09 +01:00
Jim LAURIE
7d9cbb75f2
Merge branch 'master' into master 2018-12-23 21:02:44 +01:00
Abdón Rodríguez Davila
7d039644fa Check if plugins.json exists 2018-12-23 17:02:45 +01:00
Abdón Rodríguez Davila
809ecb6a69
Merge branch 'master' into fix-gae-deploy 2018-12-23 16:42:31 +01:00
Jim LAURIE
d35211a054
Merge pull request #2529 from Palivonas/patch-1 
Fix anchor in link from i18n guide to concepts
 2018-12-23 14:53:04 +01:00
Jim LAURIE
53dd67340e
Merge branch 'master' into patch-1 2018-12-23 14:52:58 +01:00
Jim LAURIE
4886538212
Merge pull request #2528 from devdavecman/patch-1 
Fix spelling mistake
 2018-12-23 14:48:22 +01:00
Andrius Palivonas
73b65abf77
Fix anchor in i18n concepts links 2018-12-23 13:14:13 +02:00
devdavecman
7d05e098f9
fix spelling mistake 
change line 88 from "[...] returned objects is formatted [...]" to "[...] returned objects are formatted [...]"
 2018-12-23 09:21:28 +01:00
Amin Zibayi
ec7c2f9d78
Improve text quality 2018-12-22 15:21:22 +03:30
Jim LAURIE
335503b67a
Merge pull request #2485 from strapi/fix/2437 
Add support for Apollo server tracing in GraphQL
 2018-12-21 17:00:42 +01:00
Jim LAURIE
da501688cb
Merge branch 'master' into fix/2437 2018-12-21 17:00:33 +01:00
Amin Zibayi
12a15f4d9f
Update quick start documentation 2018-12-21 19:03:54 +03:30
Jim LAURIE
9f147324b1
Merge pull request #2489 from KempfCreative/bugfix/plugin-documentation-readme 
Plugin Quick Start does not work as expected
 2018-12-21 12:59:51 +01:00
cupofnestor
e82d755194
Merge pull request #2 from strapi/master 
up to 1.7
 2018-12-20 14:43:57 -05:00
Michael Barajas
cbcd8749a3
Updated models to document mongodbs index 2018-12-19 14:40:33 -05:00
Abdón Rodríguez Davila
df162c1387 Avoid write actions.json if not development environment 2018-12-19 19:42:10 +01:00
Abdón Rodríguez Davila
a5dc07c0a5 Avoid write files if not development environment 2018-12-19 19:25:52 +01:00
gianca970226
a22d7010a3
Merge branch 'master' into master 2018-12-19 07:34:24 -05:00
Jonathan Kempf
8c01331176 Merge branch 'master' of https://github.com/strapi/strapi into bugfix/plugin-documentation-readme 2018-12-18 10:31:46 -05:00
Jim LAURIE
1233d5fac9
Merge pull request #2509 from strapi/3.0.0-alpha.17 
3.0.0-alpha.17
 2018-12-18 15:27:50 +01:00
Jim LAURIE
d6e1c8fc02 Fix publish documentation plugin 2018-12-18 15:18:00 +01:00
Jim LAURIE
e48204bc75 Add migration guide from alpha.16 to alpha.17 2018-12-18 14:54:51 +01:00
gianca970226
66b5607351
Merge branch 'master' into master 2018-12-18 08:46:41 -05:00
Jim LAURIE
fd3ae96498 3.0.0-alpha.17 v3.0.0-alpha.17 2018-12-18 14:37:15 +01:00
almera
240639137b Merge branch 'master' of https://github.com/gianca970224/strapi 2018-12-18 08:26:31 -05:00
almera
eb8b166afa Fix indent 2018-12-18 08:26:01 -05:00