Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update upstream #1

Merged
merged 27 commits into from
Sep 22, 2018
Merged

Update upstream #1

merged 27 commits into from
Sep 22, 2018

Conversation

adotpeng
Copy link
Owner

No description provided.

limingxinleo and others added 27 commits August 31, 2018 15:05
@limingxinleo @huangzhhui
Fix Travis Ci (#190)
341fc59
@inhere @huangzhhui
fix: ws server push method param is error (#186)
2bbc954
@huangzhhui
Squashed 'src/view/' changes from e28044b4..befcc931
45b3688 
befcc931 Upstream travis ci config (#160)
8aca2bd5 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/view
git-subtree-split: befcc931c8979b0b42f2f80c5f65f5bd58c3a2f2
@huangzhhui
Merge commit '45b368890cefb1bb08c98c26d0153b88c630a896'
ac78133
@limingxinleo @huangzhhui
使用StringHelper::ucfirst 代替 ucfirst，解决中文乱码的BUG (#194)
92d2bea
@shixinke @huangzhhui
fix a bug when warnings appear in the high version of swoole (#195)
2402c4f
@inhere @huangzhhui
fix error on trigger event handler (#196)
898a6be 
fix swoft-cloud/swoft#377
@aprchen
fix cache key repeat
45c2a73
@aprchen @huangzhhui
Fixed cache key repetition (#197)
453ba30
@aprchen
fix session get getExtendedData
fdaaead
@aprchen
fix session get getExtendedData and add manager test,enable redis
40ef80d
@aprchen
Update composer.json
1e6fb27 
add redis
@aprchen
cs-fix
e9a4f09
@aprchen
Merge branch 'master' of https://github.com/aprchen/swoft-component
8676b8d
@aprchen
Merge branch 'master' into master
3bc1102
@aprchen
remove test
993d5c7
@aprchen
Merge branch 'master' of https://github.com/aprchen/swoft-component
d24424c
@limingxinleo @huangzhhui
Features/db bug (#200)
cfa08ed 
* 修改bigint，0验证失败的BUG

* 当实体主键为null时，再覆盖主键

* 完善单测
@adotpeng @huangzhhui
表模型中存在下划线的字段名时，使用 Swoft\Helper\StringHelper::camel() 转换 (#191)
26be82a
@huangzhhui
Fixed swoft-cloud/swoft#293 and clean codes, also remove `App\Task\Ta…
3c1de37 
…sk::run2()` method. (#192)
@limingxinleo @huangzhhui
Fix Travis Ci (#201)
46bf2f3
@huangzhhui
Merge branch 'master' of https://github.com/aprchen/swoft-component i…
65c282b 
…nto aprchen-master
@huangzhhui
Revert ./composer.json and remove useless comment and fix code style
c5fbd67
@huangzhhui
t push origin masterMerge branch 'aprchen-master'
b7e2255
@limingxinleo @huangzhhui
Fix 找不到$client的BUG (#199)
a79ee5d
@limingxinleo @huangzhhui
修改更新和新增时，表名是Mysql关键字会报错的BUG (#204)
aa8f960
@huangzhhui
Fix auth travis ci (#205)
d7a44f3
@adotpeng adotpeng merged commit 7a32943 into adotpeng:master Sep 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@adotpeng @limingxinleo @inhere @huangzhhui @shixinke @aprchen