yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-28 03:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 111 Branches 486 Tags
Commit Graph

36 Commits

Author SHA1 Message Date
Jim LAURIE
6a3d2daac1
Merge branch 'master' into feature/998 2019-01-06 15:27:11 +01:00
Jim LAURIE
3998194532
Merge branch 'master' into feature/2432 2019-01-03 14:23:05 +01:00
Jim LAURIE
6de05cbdad Add debug option on strapi new 2018-12-28 16:51:02 +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
Chaitanya Choudhary
b04ba69370 Ability to use custom timestamps. 2018-12-28 14:17:12 +05:30
Chaitanya Choudhary
230a8af1f7 Force attribute not required in database object. 2018-12-26 13:50:53 +05:30
Chaitanya Choudhary
cf713b2c58 Add force option when database not empty with bookshelf 2018-12-24 15:39:51 +05:30
Jim LAURIE
d201072954
Merge branch 'master' into fix-2257 2018-12-12 16:45:44 +01:00
Javier Castro
b0a21b46f0 strapi-hook-bookshelf: minor change for code clarity 2018-12-12 12:36:29 -03:00
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
Jim LAURIE
2c2ed2984a Update bookshelf generateMatchStage 2018-11-23 15:09:16 +01:00
Kamal Bennani
511ca55461
fix 1st level deep filter 2018-11-19 00:10:48 +01:00
Kamal Bennani
957368b8b2
Add a support of deep filter in bookshelf 2018-10-28 23:44:38 +01:00
Kamal Bennani
e5ce8c1b42
use the new method to generate the collection name 2018-10-28 23:42:19 +01:00
entwicklerfr
bf7809f3dd Add IF NOT EXISTS parameter for creating indexes in postgresql case 2018-10-18 22:34:22 +02:00
Jim LAURIE
99ce46f6bb Delete path on save in sql column generator 2018-10-08 10:40:28 +02:00
Alberto Maturano
2fcab8f9d1 Fix validation for avoid create invalid indexes 
Fix the validation introduced with #1950
Fix #1382

Add skip eslint rule to avoid error
 2018-09-30 12:22:43 -05:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions 
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
 2018-09-24 12:33:09 -05:00
Jim LAURIE
c4cb9ccfab
Merge branch 'master' into fix-1885 2018-09-24 19:11:14 +02:00
Nick Bolles
a739f67a17
Merge branch 'master' into njb/fix-strapi-new 2018-09-18 23:32:21 -05:00
Jim LAURIE
9b94a73b8d Fix association detection 2018-09-18 15:32:12 +02:00
Marcello Vetro
7a4453b917 Fix SQL ORM CREATE FULLTEXT INDEX SEARCH Error: If aren't text colums definend in the schema do not lanch the SQL to create the fulltext index. 2018-09-13 18:51:37 +02:00
NickBolles
4d631f11d7 use callback function for rimraf to catch errors 2018-09-12 23:06:53 -05:00
NickBolles
8f63b127e6 Add rimraf dependency 2018-09-12 22:21:26 -05:00
NickBolles
06fec8a19c Fix hooks to require the correct package and remove tmpPath on all platforms 2018-09-12 22:03:31 -05:00
Jim LAURIE
bb38f2a42c Handle bookshelf fix #1490 2018-08-31 11:41:21 +02:00
Alberto Maturano
1a3e01c66f Fix linter errors 2018-08-20 14:37:49 -05:00
KuongKnight
f508da6fce Fixed custom primaryType option 2018-08-02 23:13:38 +07:00
KuongKnight
6c0abfc314 change length to 36 for type uuid mysql 2018-08-02 00:05:29 +07:00
KuongKnight
dd7e6a479c Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	packages/strapi-hook-bookshelf/lib/index.js
 2018-08-01 14:38:59 +07:00
Jim LAURIE
2c85b0f8d8
Merge branch 'master' into fix-1645 2018-07-26 14:52:35 +02:00
Jim LAURIE
f6f65aa270 Fix #1645 2018-07-26 14:19:47 +02:00
DMehaffy
c38112ed56 change mysql from text to longtext 2018-07-25 11:04:22 -07:00
Jim LAURIE
83b032e9b3 Fix udpate file SQL via content manager fix #1461 2018-07-20 17:20:06 +02:00
Jim LAURIE
cf8184e223 Use hook prefix and rename 2018-07-11 16:23:14 +02:00