yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-25 09:08:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 120 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
16e34102f5 Add ids to ctm 2018-11-20 15:25:32 +01:00
Aurelsicoko
6308c71d6e Add FullStory component 2018-11-20 15:02:48 +01:00
Jim LAURIE
7574e1762a
Merge pull request #2340 from josephdburdick/patch-1 
Rephrase "NoSQL databases only" models note
 2018-11-20 14:47:26 +01:00
Jim LAURIE
855b282e0d
Merge branch 'master' into patch-1 2018-11-20 14:47:15 +01:00
Jim LAURIE
e2e0db000b
Merge pull request #1963 from marcellovetro/master 
Fixed SelectMany Dropdown Input search Ajax Call on search
 2018-11-20 12:09:33 +01:00
Joe
5da0f28515
Update models.md 
Rephrase "NoSQL databases only" note to improve sentence structure.
 2018-11-20 00:12:57 -05:00
Kamal Bennani
886e39d196
I'm a newby 2018-11-19 21:48:54 +01:00
Kamal Bennani
17140fb4b0
Add strapi-utils dependency at the root level of the project folder 2018-11-19 21:48:15 +01:00
Kamal Bennani
4a7cae4ac0
Stringify ObjectID 2018-11-19 21:47:48 +01:00
Marcello
5eed701b22
Placed handleInputChange after getOptions 
Refactoring for continuous-integration build error
 2018-11-19 19:07:17 +01:00
Aurelsicoko
a30c7844a9 Generate generic dataloader for manyToMany relationships 2018-11-19 16:58:16 +01:00
Kamal Bennani
8500403297
Add missing this* 2018-11-19 15:42:00 +01:00
cyril lopez
958f4f7516
Merge branch 'master' into master 2018-11-19 15:00:44 +01:00
soupette
9368d45c24 Fix lint 2018-11-19 12:14:43 +01:00
Kamal Bennani
53849ff12c
Fix sort 2018-11-19 00:12:09 +01:00
Kamal Bennani
511ca55461
fix 1st level deep filter 2018-11-19 00:10:48 +01:00
Kamal Bennani
85eeb4aef2
Fix wrong rebase 2018-11-18 23:57:03 +01:00
Jim LAURIE
b16fd8c452
Merge pull request #2318 from strapi/fix/2238 
Fix manyToOne association results for GraphQL
 2018-11-18 15:04:19 +01:00
Jim LAURIE
5902904c4e
Merge branch 'master' into fix/2238 2018-11-18 15:04:12 +01:00
Jim LAURIE
ec1e788469
Merge pull request #2316 from strapi/fix/manyToMany 
Allow array of IDs to manage relations through generated API
 2018-11-18 14:16:36 +01:00
Jim LAURIE
6053e10ffc
Merge branch 'master' into fix/manyToMany 2018-11-18 14:16:23 +01:00
Jim LAURIE
c03f6f92ac
Merge pull request #2320 from maturanomx/refactor/codeQuality 
Refactor code quality
 2018-11-18 13:31:26 +01:00
Jim LAURIE
e7bd84a1e8
Merge branch 'master' into refactor/codeQuality 2018-11-18 13:30:49 +01:00
Leo
9a5547d4c7 Fix mongoose float and decimal problems 2018-11-18 16:25:28 +08:00
ByoungYong Kim
6bc3009537 Fixed a bug 2018-11-17 22:55:41 +01:00
ByoungYong Kim
fa2c6f37aa
Merge branch 'master' into fix/reattempt-1851 2018-11-17 20:27:08 +01:00
Jim LAURIE
83f8ff0e51
Merge pull request #2302 from dalirnet/master 
Update template for lifecycle callback
 2018-11-17 14:01:16 +01:00
Kamal Bennani
da5ca2a125
Link the strapi-utils dependecy to the users-permissions module in the setup step 2018-11-17 13:50:50 +01:00
Amir Reza Dalir
9e4d5abbff
Merge pull request #1 from dalirnet/develop 
Develop
 2018-11-17 16:18:02 +03:30
Jim LAURIE
0164b854fd
Merge branch 'master' into master 2018-11-17 13:34:58 +01:00
Jim LAURIE
1d17a43d61
Merge pull request #2329 from BrandonS8/patch-1 
Gender neutral terms
 2018-11-17 13:30:17 +01:00
Brandon Sears
60a36fae56
Gender neutral terms 
Change "his/he" when referring to a user to "their/they"
 2018-11-16 15:42:46 -05:00
soupette
428a9ca62d Fix schema 
Force lowerCase on content type name (since it is not supported by the backend)
Clean layout when the model has been removed
 2018-11-16 18:34:12 +01:00
soupette
4b26453e0e Fix schema 2018-11-16 18:32:26 +01:00
Jim LAURIE
19ec6242f9
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute 2018-11-16 17:38:27 +01:00
soupette
fc7ef829a0 Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-16 17:13:14 +01:00
Aurelsicoko
3d7dacef70 Apply options on Mongoose instance 2018-11-16 15:53:00 +01:00
soupette
d279ae8fa3 Improve logic by removing those fields from the options 2018-11-16 12:30:55 +01:00
soupette
a8773687cf Fix hidden fields in schema 2018-11-16 12:19:08 +01:00
Jim LAURIE
38da18aec5
Merge pull request #2305 from maturanomx/style/spanishTranslation 
Update ES translations
 2018-11-16 11:36:16 +01:00
Jim LAURIE
eb6d0aa06b
Merge branch 'master' into style/spanishTranslation 2018-11-16 11:36:06 +01:00
Jim LAURIE
578af4e698
Merge pull request #2169 from strapi/update-providers-names 
Prefix providers
 2018-11-16 10:30:12 +01:00
Jim LAURIE
11d192b9ad Fix version conflicts 2018-11-16 10:25:51 +01:00
soupette
5406b678ac Add selectors for tests and fix bugs 2018-11-16 09:18:57 +01:00
Amir Reza Dalir
5489dd6338
JSON format fix 2018-11-16 01:39:55 +03:30
Alberto Maturano
f87da6631f refactor: Remove never executed conditional part 
Also, the variable should be array type, not numeric...
 2018-11-15 15:56:03 -06:00
Amir Reza Dalir
b15e54a0b0
Added flag of Iran 2018-11-16 01:24:15 +03:30
Alberto Maturano
8fcbb1978f refactor: Fix misuse of map method 
`map` should create a new Array so a `return` is expected inside the
callback param. `forEach` is the corrent method to use for just iterate
over array elements.
 2018-11-15 15:51:23 -06:00
Amir Reza Dalir
599f525f13
Add fa language 2018-11-16 00:56:59 +03:30
Amir Reza Dalir
e9301725f1
Add FA translations 
add Persian(fa) translations
 2018-11-16 00:51:31 +03:30