Commit Graph

3696 Commits

Author SHA1 Message Date
thinkphp
c635c2caf1 修正单元测试 2017-03-08 11:02:52 +08:00
ThinkPHP
f3f80f6679 Merge pull request #538 from keepeye/master
修正模板标签默认值某些情况无效bug
2017-03-08 10:56:13 +08:00
cxz
61a9b9843a 修正模板标签默认值某些情况无效bug 2017-03-07 16:53:49 +08:00
ThinkPHP
45d3957aa4 Merge pull request #528 from thinkcmf/master
修改标签库 方法getRegex private为public
2017-03-03 22:38:12 +08:00
ThinkCMF
c5d12b8da0 Update TagLib.php
修改getRegex为 public
2017-03-03 14:01:48 +08:00
ThinkCMF
584c1a38e0 Merge pull request #1 from top-think/master
合并最新
2017-03-03 13:59:52 +08:00
yunwuxin
6d2541585d 多对多关联设置中间表模型
增加wherePivot方法
2017-03-02 14:16:12 +08:00
thinkphp
7a7ebee5c1 修正 2017-03-02 11:37:13 +08:00
thinkphp
b7eb24749f 修正一处BUG 2017-03-02 11:09:44 +08:00
thinkphp
f19a02a233 优化代码 2017-03-02 08:35:32 +08:00
thinkphp
158f3e5ff0 改进App类 2017-03-01 19:08:04 +08:00
ThinkPHP
27776728eb Merge pull request #512 from mineyang/master
修正注释里返回实例名称
2017-02-28 12:15:08 +08:00
mineyang
9f48080273 去掉多余的use 2017-02-28 10:10:23 +08:00
mineyang
8204ac3d72 修正注释里返回实例名称 2017-02-28 10:03:46 +08:00
thinkphp
16b33bc372 改进Url生成对完整域名的支持 2017-02-25 17:04:01 +08:00
thinkphp
7cb4636b07 Clear指令不删除.gitignore 文件 2017-02-25 16:09:58 +08:00
thinkphp
bcf64f19f4 调整 v5.0.7 2017-02-25 10:51:57 +08:00
thinkphp
46d76e4169 更新 2017-02-24 14:41:33 +08:00
thinkphp
428a30e296 改进Request类param方法 2017-02-24 14:02:26 +08:00
thinkphp
ddebf78c01 修正别名路由 2017-02-24 13:50:13 +08:00
thinkphp
97ee6c045b 改进Query类的view方法中字段的关键字问题 2017-02-24 13:13:18 +08:00
thinkphp
55b671f3cb 版本更新 2017-02-24 10:22:27 +08:00
thinkphp
138f48498e 改进Query类with方法 2017-02-23 18:25:20 +08:00
thinkphp
d85579faf8 改进一对一关联 2017-02-23 17:43:29 +08:00
thinkphp
87c74b3944 改进 2017-02-23 16:39:10 +08:00
thinkphp
4f874c1491 改进Loader类的model/controller/validate方法 2017-02-23 16:35:29 +08:00
thinkphp
c3e45a1a69 改进Request类 2017-02-22 18:21:30 +08:00
thinkphp
e482cbe7e8 改进Request类contentType方法 2017-02-22 11:27:07 +08:00
thinkphp
365b2a36aa 修正update方法 2017-02-20 18:37:38 +08:00
thinkphp
46353f20a0 修正JOIN方式一对一关联预载入闭包查询 2017-02-20 17:43:15 +08:00
thinkphp
dcb46092d1 模型改进 2017-02-20 11:20:18 +08:00
thinkphp
e9dd69953b Merge branch 'master' of https://github.com/top-think/framework 2017-02-18 21:33:34 +08:00
thinkphp
f00825a477 改进软删除 2017-02-18 21:33:00 +08:00
thinkphp
09629cda78 改进类型转换为array的时候输出判断 2017-02-17 13:33:57 +08:00
thinkphp
140a3f82e8 Merge branch 'master' of https://github.com/top-think/framework 2017-02-16 17:56:11 +08:00
thinkphp
56008a2c36 修正Route类parseUrlPath方法 2017-02-16 17:55:42 +08:00
ThinkPHP
94f5759f61 Merge pull request #477 from hldh214/patch-4
修复 WHERE IN / NOT IN 型查询条件为空导致的 sql 语法错误
2017-02-15 16:05:21 +08:00
Jim Liu
e8df221a8d 修复 WHERE IN / NOT IN 型查询条件为空导致的 sql 语法错误 2017-02-15 12:22:58 +08:00
thinkphp
855124a514 改进分页类 2017-02-15 08:49:22 +08:00
thinkphp
c917ad1ce9 改进Query类缓存机制 2017-02-14 16:25:33 +08:00
thinkphp
bc1bd1b742 改进Model类delete方法 2017-02-13 19:02:18 +08:00
ThinkPHP
0fa7dd3f85 Merge pull request #432 from dotku/master
改进异常页面的手机显示样式
2017-02-13 15:34:04 +08:00
ThinkPHP
af2b5d474c Merge pull request #471 from mineyang/master
配置参数名只分割为两部分
2017-02-13 15:17:12 +08:00
ThinkPHP
342448dfdd Merge pull request #436 from cnbailian/master
优化Router代码
2017-02-13 15:11:52 +08:00
ThinkPHP
d4c9a933e6 Merge pull request #438 from hooklife/bugfix3
修改架构函数为  构造方法
2017-02-13 15:09:16 +08:00
苗高鹏
21834f797d Merge branch 'master' into bugfix3 2017-02-13 14:53:24 +08:00
mineyang
a414d123f9 配置参数名只分割为两部分 2017-02-13 14:26:30 +08:00
ThinkPHP
59c6ec2dce Merge pull request #469 from mineyang/master
默认关闭session的安全传输,此选项仅能在HTTPS下设置开启
2017-02-13 13:38:12 +08:00
mineyang
ea9fe74bc3 默认关闭session的安全传输,此选项仅能在HTTPS下设置开启 2017-02-13 13:09:45 +08:00
thinkphp
2c0ee2f616 改进软删除 2017-02-09 19:12:45 +08:00