Commit Graph

5108 Commits

Author SHA1 Message Date
huang a9e62618f1 Merge branch 'develop' into dev_newproject 2016-11-02 17:30:18 +08:00
cxt fea07e07c1 分组作业:基本作业编辑为分组作业后,组长提交作品的时候不能添加组员 2016-11-02 17:17:12 +08:00
cxt ecae600546 启动匿评、关闭匿评的提示 2016-11-02 16:46:47 +08:00
huang e0027c0e00 解决wechat引起的项目申请拒绝问题 2016-11-02 16:36:08 +08:00
huang 928412e83d admin中添加导出所有项目统计 2016-11-02 15:33:42 +08:00
cxt 54f45f18a5 匿评设置的调整 2016-11-02 15:19:17 +08:00
huang 9da165b2b7 issue查看差别界面 2016-11-02 14:18:17 +08:00
cxt 4e267c22b3 班级学生列表-导出列表:作业积分统计错误 2016-11-01 17:25:02 +08:00
cxt 065b3b15f3 代码梳理 2016-11-01 16:01:36 +08:00
cxt ec45ee89d9 已截止的分组作业:组长可编辑成员 2016-11-01 15:59:00 +08:00
huang a5193cd266 版本库显示调整,及汉字姓名 2016-11-01 15:24:02 +08:00
huang f0a713f54e 解决部分项目提交数为0的问题,版本库登录名改成中文姓名 2016-11-01 14:54:29 +08:00
huang 85db4d7fd1 版本库权限简化,及超级管理员可以查看项目版本库 2016-11-01 14:09:56 +08:00
huang b5b6f49d7c 项目版本库提供时间显示 2016-11-01 12:17:52 +08:00
huang dfbc2657d2 项目新建的时候加入Kindedit及标题为空样式调整 2016-10-31 15:14:52 +08:00
cxt 157cf4262f 学生查看问卷答题结果时按题号排序 2016-10-31 10:41:00 +08:00
huang 72f75b41d0 Merge branch 'cxt_course' into develop 2016-10-28 18:06:12 +08:00
huang df07914fbc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-28 18:05:02 +08:00
huang d76ce0706e 统计页面JS实现 2016-10-28 18:04:49 +08:00
cxt 21655565ea 班级分班进行删除时,根据是否有成员,做不同的提示 2016-10-28 17:49:09 +08:00
yuanke e018e301ef 项目关注BUG修改 2016-10-28 17:47:21 +08:00
huang df47c09fa4 版本库一些细节调整 2016-10-28 16:53:02 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-28 15:57:53 +08:00
huang 3699ddd398 pull request统计数显示所有 2016-10-28 15:47:05 +08:00
cxt 4d88fe727b 问卷 2016-10-28 15:42:45 +08:00
huang 68c0999a58 删除无版本库的项目报错 2016-10-28 14:24:26 +08:00
huang b0b5e203b3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-28 14:20:12 +08:00
huang d2138dd872 里程碑中增加创建者、项目私有公开显示特性 2016-10-28 14:20:00 +08:00
yuanke abbf39848b Merge branch 'yuanke_youhua' into develop 2016-10-28 13:23:59 +08:00
huang 58da3924ab pull request设计效果验证修改 2016-10-28 12:28:41 +08:00
huang 40620d139d 项目附件动态展开更多过滤条件中含有issue问题 2016-10-28 11:04:12 +08:00
huang 7e2834f680 退出项目成员以及项目邀请码显示权限 2016-10-28 10:46:00 +08:00
huang 4df7e41515 里程碑详情局部刷新 2016-10-28 09:20:04 +08:00
huang 225b80d3b3 质量分析页面导航变色 2016-10-28 09:05:37 +08:00
cxt cc2ef93808 多选题的上限 2016-10-27 18:25:47 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
huang 8706d3b791 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 17:30:35 +08:00
huang d42417d9d5 里程碑编辑路径跳转 2016-10-27 17:30:22 +08:00
daiao 5089d2f9fd 里程碑列表排序,Issue详情回复宽度 2016-10-27 17:24:28 +08:00
huang ee275455de 各个页面里程碑的新建跳转 2016-10-27 16:33:00 +08:00
cxt 2bd044bea7 问卷 2016-10-27 15:38:10 +08:00
cxt c79676d426 问卷的上移、下移 2016-10-27 15:11:52 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
cxt a00fd27eee 问卷调整 2016-10-27 13:57:03 +08:00
huang d8f30f4dbe Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 12:39:56 +08:00
huang 05b206a7cf 收藏者列表 2016-10-27 12:39:44 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
daiao d9189487e3 Isuue新建里程碑弹框 2016-10-27 11:15:28 +08:00
huang 7c0ff4bbe2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 18:39:48 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
daiao 3080c8ff09 里程碑列表,新建弹框 2016-10-26 18:04:12 +08:00
huang a83f5317bb 里程碑列表页面添加删除 2016-10-26 16:28:40 +08:00
huang 68ff26e3ef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:41:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
daiao a40d6933f6 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:18:42 +08:00
daiao 3229277737 里程碑编辑弹框 2016-10-26 15:18:07 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
yuanke a9136bd8d0 班级微信通知改为异步发送 2016-10-26 11:18:05 +08:00
huang 187a96b251 pull request评论局部刷新及样式 2016-10-25 15:34:32 +08:00
huang a0ff6a0cb1 完成项目讨论区的拉宽工作 2016-10-25 14:47:05 +08:00
huang f41696eaee 版本库创建跳转及显示 2016-10-25 13:32:22 +08:00
huang a86ad7d99a 项目配置各种局部刷新(新建编辑提示等) 2016-10-25 11:11:25 +08:00
cxt c962e3c18b 导入问卷后进入问卷再回退,再点击该问卷,页面报404 2016-10-24 17:35:06 +08:00
huang 651ea5d189 配置页面,里程碑编辑删除局部刷新以及标题为空JS判断 2016-10-24 16:36:08 +08:00
cxt 3d3b46f7f3 问卷:没有选定时,其它 选项的输入框禁用。选择了才可用 2016-10-24 16:01:46 +08:00
huang d385123a93 里程碑添加导出功能 2016-10-24 15:42:22 +08:00
cxt fcb1d4d115 打开分班名称编辑框后,点击其他分班名称或全部、未分班,数据刷新,但是编辑框未收起,应该收起 2016-10-24 14:02:09 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +08:00
yuanke b7cd1e8fa2 Merge branch 'cxt_course' into develop 2016-10-21 19:59:37 +08:00
cxt fefc1bf800 分組作业的动态和详情的调整、作品列表增加项目提示和老师加入项目的功能 2016-10-21 19:58:02 +08:00
yuanke 5811f3944e 小班导出列表500BUG 2016-10-21 19:25:09 +08:00
yuanke f785fe4fbd 修改路由 2016-10-21 19:14:07 +08:00
daiao e23b01f90c 项目里程碑详情页面的issue统计页面 2016-10-21 19:04:58 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
daiao fa453090aa 项目里程碑详情页面 2016-10-21 16:16:26 +08:00
yuanke 7f99c2fdc5 Merge branch 'weixin_guange' into develop 2016-10-21 15:39:28 +08:00
yuanke a363b89e32 点联系我们提示文字修改 2016-10-21 15:22:08 +08:00
huang 49c77312da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-21 14:23:20 +08:00
daiao 624cba3228 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:22:44 +08:00
daiao 64dd693e6f 项目里程碑详情页面 2016-10-21 14:22:14 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
yuanke 1f0e8649b9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:07:14 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
huang 3ccff07bf0 项目动态issue模块删除的时候样式 2016-10-21 11:26:15 +08:00
huang a3da43b793 里程碑列表 2016-10-20 18:08:24 +08:00
cxt 0ccb6b884a 编辑作业时分组作业的评分比例 2016-10-20 17:31:48 +08:00
cxt e8d7e64f80 主页子页面链接 2016-10-20 16:18:45 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt 251465ceb5 袁可 编程 2016-10-19 19:41:02 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang c34209534d 版本库展开文件目录异步刷新 2016-10-19 15:51:55 +08:00