yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-22 15:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,041 Commits 122 Branches 490 Tags
Commit Graph

59 Commits

Author SHA1 Message Date
Aurelsicoko
2bf3165985 Bypass SQLite connection check and fix project generation 2019-02-13 18:56:04 +01:00
Jim LAURIE
92abd536cb
Merge branch 'master' into master 2019-02-10 17:26:18 +01:00
Jim LAURIE
8334ca6088
Fix mysql and pg test connection 2019-02-04 15:39:47 +01:00
Sajjad Shirazy
dfead41387 use _.castArray instead, it'll only cast the value to an array if it's not the case already 2019-02-04 12:20:17 +03:30
Sajjad Shirazy
1768bbc209 forgotten pull 2019-02-03 15:10:04 +03:30
Sajjad Shirazy
9453eb3829 Merge branch 'master' of https://github.com/sajjad-shirazy/strapi 2019-02-03 15:08:57 +03:30
Sajjad Shirazy
a9606b6eae Supporintg IN and NOT IN as a filter type 2019-02-03 15:08:36 +03:30
Sajjad Shirazy
4d4d32837c Supporting NOT IN as a filter 2019-02-03 14:04:22 +03:30
Sajjad Shirazy
ec0992b3b9
Supporting NOT IN as a filter 2019-02-02 16:25:03 +03:30
Jim LAURIE
6cbddab6c8 Fix PR feedback 2019-01-31 14:17:52 +01:00
Jim LAURIE
fdcecff2e6 Add test and fix model update 2019-01-31 14:05:59 +01:00
Jim LAURIE
3db3b93fdb
Merge branch 'master' into sqlite-support 2019-01-31 11:15:19 +01:00
DMehaffy
590012a8f1 Temp fix for bookshelf bigint 2019-01-30 05:53:10 -07:00
Jim LAURIE
412fcbb298
Merge branch 'master' into sqlite-support 2019-01-24 15:00:19 +01:00
Jim LAURIE
0238257eec Fix get timestamp in the admin 2019-01-23 15:19:34 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Jim LAURIE
6a3d2daac1
Merge branch 'master' into feature/998 2019-01-06 15:27:11 +01:00
Aurélien Georget
b501e8bb1b Resolve conflicts 2019-01-05 20:33:47 +01:00
Pierre Burgy
b1f063abe0 Add JSON support for SQLite 2019-01-03 23:29:30 +01:00
Pierre Burgy
7b6558884e Fix lint error 2019-01-03 22:52:39 +01:00
Jim LAURIE
3998194532
Merge branch 'master' into feature/2432 2019-01-03 14:23:05 +01:00
Pierre Burgy
fddf391e84 Add SQLite support 2018-12-29 21:35:07 +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
Aurélien Georget
e1ce257d2f Revert codebase and apply limit, skip, start and sort parameters 2018-12-06 18:11:53 +01:00
Jim LAURIE
03c1e04d87 Revert filter PR 2018-12-04 17:05:03 +01:00
Aurélien Georget
b0aaae9f12 Resolve conflicts 2018-11-27 18:48:37 +01:00
Jim LAURIE
2c2ed2984a Update bookshelf generateMatchStage 2018-11-23 15:09:16 +01:00
Aurelsicoko
21d21dfc8f Handle single fetch & allow override of default auto-population 2018-11-22 18:32:33 +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