Commit Graph

143 Commits

Author SHA1 Message Date
Li Jianxuan 5abff99764 Merge branch 'development' into 'master'
Development

See merge request !8
2015-05-03 10:43:35 +08:00
Jianxuan Li 769f2dbb14 add new update function 2015-05-02 18:06:35 +08:00
Jianxuan Li 4905190441 fixed bug in dbh insert function 2015-05-01 17:45:17 +08:00
Jianxuan Li 013a2e0d50 add new feature 2015-05-01 15:16:28 +08:00
Jianxuan Li 9717bdbbf1 fixed bug in use speical name 2015-04-30 18:47:18 +08:00
Jianxuan Li 1d228d791c add login check logic 2015-04-30 17:29:38 +08:00
Jianxuan Li 69d3013b68 add count size function 2015-04-30 17:29:38 +08:00
Jianxuan Li eaa8a1df1b remove var_dump in westdc core 2015-04-30 17:29:38 +08:00
Jianxuan Li d7ea5bef24 add new functions 2015-04-30 17:29:38 +08:00
Jianxuan Li 6d510f9653 add login check logic 2015-04-29 21:52:11 +08:00
Jianxuan Li 7ca9ce90fd add count size function 2015-04-29 15:18:23 +08:00
Jianxuan Li 742cc16af0 remove var_dump in westdc core 2015-04-29 14:15:01 +08:00
Jianxuan Li aba37ba225 add new functions 2015-04-27 01:34:38 +08:00
Li Jianxuan 80ccd891cf Merge branch 'development' into 'master'
Development

* 更新文件上传类的内部构造,适应更多形式的文件上传需求
* 改善工具类

See merge request !7
2015-04-21 23:13:15 +08:00
Jianxuan Li bb542a79f0 fixed bug in Tools::isUuid function 2015-04-17 10:29:39 +08:00
Jianxuan Li f2c1c0e90e fixed bug in append child dir 2015-04-08 11:50:47 +08:00
Jianxuan Li e3089debc6 fixed bug in file upload 2015-04-08 11:23:12 +08:00
Jianxuan Li e79e89d700 fixed bug in upload 2015-04-08 11:22:15 +08:00
Jianxuan Li d9e92d5435 Merge branch 'development' of http://git.westgis.ac.cn/westdc/westdc-core into development 2015-04-07 10:14:48 +08:00
Jianxuan Li c81e4c4694 add new function in File Upload service 2015-04-07 10:13:14 +08:00
Jianxuan Li 16351fc535 add function dirSlash() 2015-04-01 16:58:41 +08:00
Li Jianxuan 42cb1f40ae Merge branch 'master' into 'master'
Merge to Westdc\Master

* 合并开发工作

将westdc-core开发移到主项目

See merge request !6
2015-03-30 16:16:47 +08:00
Li Jianxuan 74257590dd Merge branch 'development' into 'master'
Development to master

* 增加新功能
* 修复bug

See merge request !3
2015-03-30 16:14:17 +08:00
Jianxuan Li 1369865cc4 add uuid output in upload function 2015-03-27 15:51:12 +08:00
Jianxuan Li 1e95299c0e add GetSql function in select handle 2015-03-26 23:12:13 +08:00
Jianxuan Li 9a6411303d update file upload class 2015-03-25 10:35:21 +08:00
Jianxuan Li 2199a26b83 add SelectHandle in Db service 2015-03-21 11:16:15 +08:00
cuixin 5c8e3d8ccb add using ZendDb 2015-03-13 13:50:38 +08:00
Jianxuan Li af9a7d150b fixed bug in cookie login 2015-03-08 16:21:02 +08:00
Jianxuan Li d57092312b perfect the AuthenticationService and database operate handle object 2015-03-07 11:39:06 +08:00
Jianxuan Li 0b10bd6ec1 fixed bug in record 2015-03-05 14:21:37 +08:00
Jianxuan Li 999bbef504 fixed issue of dbh import 2015-03-04 17:08:29 +08:00
Jianxuan Li 298681e21c perfection the db record object 2015-03-04 14:51:26 +08:00
cuixin cf828a938f add User::usertypeChange,userpwdChange 2015-03-03 11:59:07 +08:00
Jack Freeman 4fa342c3ce perfect the Westdc\Db\Record 2015-02-26 00:03:43 +08:00
Jack Freeman 687f1e9cb7 修改ServiceManager调用为单例模式 2015-02-21 23:20:21 +08:00
Jack Freeman dee53af2fc 将ServiceManager修改为单例模式,修改几处ServiceManager调用 2015-02-21 23:17:27 +08:00
Jianxuan Li d668cc6aa4 Merge branch 'development' of http://git.westgis.ac.cn:8000/lijianxuan/westdc-core into development 2015-02-17 19:26:52 +08:00
Jianxuan Li eedbe48f0a perfection the paginator service 2015-02-17 19:25:25 +08:00
Li Jianxuan 2948bd00ac Merge branch 'development' of git.westgis.ac.cn:lijianxuan/westdc-core into development 2015-02-16 16:05:59 +08:00
Li Jianxuan 2aa7f09eca 增加Westdc\Db\Record插件,在Db service中增加 getRecordHandle()方法 2015-02-16 16:04:47 +08:00
Jack Freeman 2bb4f64edb Merge branch 'development' of git.westgis.ac.cn:lijianxuan/westdc-core into development 2015-02-14 21:16:17 +08:00
Jack Freeman 0a266bef02 增加附件上传功能 2015-02-14 21:15:52 +08:00
cuixin 7645b55cd2 add user view,ban 2015-02-13 23:21:33 +08:00
cuixin 965c97eda4 add user register info(addr,unit,phone) 2015-02-13 19:16:17 +08:00
Jack Freeman 3cead0e3e7 Merge branch 'development' of git.westgis.ac.cn:lijianxuan/westdc-core into development 2015-02-09 22:27:15 +08:00
Jack Freeman 6da1b02766 完善附件管理服务 2015-02-09 22:26:48 +08:00
cuixin 863a4cdbe3 modify user register 2015-02-09 11:37:25 +08:00
Jack Freeman d582fabb56 修改附件搜索中的bug 2015-02-08 22:18:01 +08:00
Jack Freeman d58d7099c0 添加附件管理服务 2015-02-08 22:12:08 +08:00