Commit Graph

6838 Commits

Author SHA1 Message Date
sw 0769da1426 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 17:13:09 +08:00
lizanle 3fc02585c5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-23 17:13:52 +08:00
lizanle 6353a2e2c8 留言分页 2015-05-23 17:13:38 +08:00
sw 26ae4b7d74 用户头像不能上传 2015-05-23 17:12:50 +08:00
sw 14aa3e83a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 16:51:46 +08:00
sw 822ac5ade8 公共贴吧引用上传图片异常 2015-05-23 16:50:28 +08:00
yutao fa26f649f2 ... 2015-05-23 16:49:54 +08:00
yutao 8781eb3238 ... 2015-05-23 16:26:15 +08:00
sw 85b7a43cb1 Merge branch 'szzh' into develop 2015-05-23 15:19:50 +08:00
sw 74fe58217f Merge branch 'guange_dev' into szzh 2015-05-23 15:19:01 +08:00
sw 3b433cb751 Merge branch 'szzh' into guange_dev 2015-05-23 15:17:46 +08:00
yutao c4c2da48db 修复bug#2485:项目--问题跟踪相关建议 2015-05-23 11:55:26 +08:00
huang ceafa459fd issues编辑时跳转问题 2015-05-23 11:26:36 +08:00
huang 4ab6558a5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 10:40:48 +08:00
huang 379de18cd6 修改资源库全站搜索:
1、搜索条件为空的时候,不允许显示全部资源
2、全站搜索,非自己上传的资源不允许查看
3、全站搜索,项目管理员能设置公开权限的资源在全局搜索中也可以
2015-05-23 10:40:15 +08:00
yutao 491a7a13aa bug#2659 2015-05-23 10:17:16 +08:00
yutao a7de4b4646 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-23 10:11:17 +08:00
yutao 5460e98526 ... 2015-05-23 10:10:47 +08:00
huang 2ac2884bf1 修改issue注入异常报错(比如项目名带点号) 2015-05-23 10:10:38 +08:00
yutao 53503bffe4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 16:38:41 +08:00
yutao 9c84837492 ... 2015-05-22 16:38:26 +08:00
huang 052d293f82 新建项目时候:
如果我的项目中有重名的项目不允许新建
2015-05-22 16:30:22 +08:00
guange b5d9cf55ff 将域名配置加入到管理员后台 2015-05-22 15:59:37 +08:00
sw 47ce289bb6 Merge branch 'szzh' into develop 2015-05-22 14:48:22 +08:00
sw 78cb9815a7 Merge branch 'guange_dev' into szzh 2015-05-22 14:47:46 +08:00
sw ec1c9c2ac1 Merge branch 'szzh' into guange_dev 2015-05-22 14:46:46 +08:00
sw 016432ad08 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 14:46:20 +08:00
yutao a6e15f5609 ... 2015-05-22 11:27:47 +08:00
yutao cb395a33f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 11:21:17 +08:00
yutao 04e9618a59 修复bug#2357:项目--邀请注册用户,成功搜索后若忘了选择用户或角色直接邀请,建议不要再让用户重新搜索了 2015-05-22 11:20:41 +08:00
huang 67061d0ee5 允许新建重名项目 2015-05-22 11:18:31 +08:00
huang fcb5444076 修改竞赛搜索结果页面按钮异常 2015-05-22 10:43:50 +08:00
huang eb539073ec Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 10:35:52 +08:00
huang 975b19c5de 修改缺陷“添加于”“更新于”逻辑 2015-05-22 10:35:27 +08:00
huang a3fd541119 优化邮件邀请新用户、已注册用户 2015-05-22 10:15:57 +08:00
yutao a7e2e4766a 修复bug#2480:course主页查询课程输入关键字“数据库”,如图课程“课程简介”字样被截断了 2015-05-22 09:50:20 +08:00
yutao 8af59f6f39 修复bug#2621:课程实践平台—课程作业—发布作业:编辑器的框大小可以任意伸缩,在伸缩后,不能还原。 2015-05-21 17:24:39 +08:00
yutao 30bc053f47 ... 2015-05-21 16:56:08 +08:00
yutao bfb0a43de1 修复bug#2485:项目--问题跟踪相关建议 2015-05-21 16:35:50 +08:00
guange eb73ba0b43 kindeditor界面打开时,有一个这个界面的过渡 2015-05-21 16:05:42 +08:00
guange 689ec5cdfc 课程通知列表更多功能bug 2015-05-21 15:57:58 +08:00
lizanle 2047f17191 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-21 15:57:47 +08:00
lizanle 8e04b4e565 回复留言 2015-05-21 15:57:35 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
huang 4cef831c3a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-20 17:32:46 +08:00
huang e2f0aeb693 公共贴吧--帖子里面搜索错误 2015-05-20 17:32:16 +08:00
lizanle d6fe4082af Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-20 17:27:35 +08:00
lizanle dced5f328e 用户留言列表api
给用户留言 api
2015-05-20 17:27:17 +08:00
yutao a62823fdc0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-20 16:42:42 +08:00
yutao b0992dcd6a 修改bug 2015-05-20 16:41:55 +08:00