Commit Graph

9236 Commits (fbba933a46fba087b57e91ec45660fe6d7566396)

Author SHA1 Message Date
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange
10 years ago
huang 3af96c96e7 finalize the commit_counts problems by hx
10 years ago
houxiang c3bbf3490f modify show
10 years ago
houxiang b3d36705d2 modify the commit_count by hx
10 years ago
ouyangxuhua 68bb142278 解决组织bug:动态过滤,点击“展开更多”,有通知等其他动态
10 years ago
huang 85a219f7e9 项目动态\清除
10 years ago
huang 39455f9f8a 作业重复提交问题
10 years ago
houxiang 56519389d2 add binarysearch for commit_count by hx
10 years ago
ouyangxuhua 71e98c873d 组织回复框中,默认图片颜色为灰色,当焦点放在输入框时,图片颜色变亮。
10 years ago
ouyangxuhua 1914639bc3 成功添加某成员后,在搜索框中输入的该成员关键字就要自动清空
10 years ago
ouyangxuhua 65548cd8c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua d2a87127da 我的组织搜索功能显示
10 years ago
huang 83c7e981af Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt dbe236032b 新建题目时必须先保存标题
10 years ago
huang 3083f683b9 修改删除的时候顺序乱的问题
10 years ago
huang 550d056630 删除某个题目后顺序排列
10 years ago
cxt 89f8f5f383 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt b10fbcde8c 取消发布和发布测验
10 years ago
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course
10 years ago
cxt b9460efa08 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt cc19c345e1 提交
10 years ago
huang 2435f06f44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 8b29002a0f 修改得分规则
10 years ago
cxt c36ec99ff6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 9ca336a70a 发布和取消发布
10 years ago
huang c0dfc17b19 修改状态更新
10 years ago
huang da55b00da7 删除插入问题
10 years ago
huang a3122a9a2c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang aa36c927d3 0
10 years ago
cxt c07e2fe2d2 发布试卷
10 years ago
cxt 98297da226 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt c9ba57f64b 去掉关闭、导入等功能
10 years ago
huang bb726e3475 提交答案验证
10 years ago
huang d1e0e0fd30 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 97485ca221 修改show逻辑
10 years ago
cxt da34083a2a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 332ace0f34 列表
10 years ago
ouyangxuhua 6068867670 项目动态和组织动态删除后,删除相应的组织动态
10 years ago
huang 431d1d886c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 8728557813 老师和学生统计数目区分
10 years ago
cxt d4d2adddb2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt eee63b2495 提交前验证数据不为空
10 years ago
huang ed86e3ee5a 三种类型题目计算总分
10 years ago
ouyangxuhua a57260aae6 修改当“Message”回复对应的组织动态
10 years ago
ouyangxuhua 5cfc8c2f8d 编辑文章后,或者回复文章后,更新组织动态的更新时间
10 years ago
huang 74f6cb2e64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang db46e5e4af 问卷得分统计
10 years ago
cxt b0730dfb81 测验
10 years ago
ouyangxuhua d77d4a421b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua dcbdea9bb5 1.修复文章详细列表删除后,页面报错的问题;
10 years ago
cxt 9f6fc79df0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 863d7ed4b5 单选和填空
10 years ago
Tim 1aa7599771 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
Tim e3d78bf4f0 组织样式更改
10 years ago
huang cb3f0d1c97 按类型分类,序号递增
10 years ago
huang 07ee819370 学生多选答题
10 years ago
huang 302dfaf933 新建万卷初始showresult
10 years ago
huang 469e71e77d Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 13af6e64b2 修改允许学生查看参数
10 years ago
cxt 99945d5bb5 学生答题界面的修改
10 years ago
ouyangxuhua e01a7c2627 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua b10ff36c51 1.组织文章和成员访问权限控制;
10 years ago
huang e9998edbc2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 4204521e14 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt acaac93da1 tijiao
10 years ago
huang 3deebf2006 show
10 years ago
ouyangxuhua faa99a5df4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 40a44c3568 增加文章二级回复功能
10 years ago
huang 21694daa59 多选顺序按小到大排序
10 years ago
cxt d583ca1d70 样式调整
10 years ago
huang 08c7eb8d40 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 81e2827277 解决参数为空的bug
10 years ago
cxt 20f7560b07 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 9aee23507c 学生答题页面、答题结果页面、老师的试卷页面
10 years ago
huang b71e6a9b9a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 20a80fe6eb 修改JS
10 years ago
huang 74343a4929 发布问卷、取消问卷
10 years ago
cxt 602373812f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt d91a6c03b1 编辑
10 years ago
huang 87e7a51278 删除
10 years ago
huang 7ab0f4764a 主管题插入删除更新
10 years ago
cxt 27c88fda4f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 2c1b03079b 学生测验界面
10 years ago
huang 02f6b636cd 完成更新功能
10 years ago
huang f3614999da gi
10 years ago
huang 841ebb7846 简单题更新,未完
10 years ago
lizanle 34a2c2c90d 课程创建属性添加 是否允许学生上传资源
10 years ago
lizanle dffabce806 Merge branch 'dev_zanle' into szzh
10 years ago
houxiang fdedcbfa81 增加了注释
10 years ago
Gan Yi.ang f6bfd7824d 优化查看commits那个页面
10 years ago
cxt cf4717278f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 5e5c18725d 用户在新建题目时必须先保存其他正在编辑的题
10 years ago
huang a900c70e76 试题更新
10 years ago
huang d7020fad1f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 3929aa6dde 编辑
10 years ago
huang 4c71d8a85e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang bc47382115 用户提交答卷后,给出得分
10 years ago
cxt 4cd9f6a502 新建题目时分数自动获取同一类型题目的最后一个分数
10 years ago
ouyangxuhua 0c891236a8 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua 09659387e7 文章动态中,将组织改成组织文章
10 years ago
ouyangxuhua 478a534c96 1.将课程动态加入组织动态的过滤条件中;
10 years ago
Gan Yi.ang ea47a8085a 修复新建版本库无响应
10 years ago
cxt c7476b3f86 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt a173e924d0 插入题目
10 years ago
huang 037d998f23 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 2296a2f50c 添加学生提交作业
10 years ago
cxt 398a7da533 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 368fc339c0 样式调整
10 years ago
huang 8cf22767f9 新建问答题
10 years ago
huang 8e4b2bd7d4 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 1606e9ddab 0
10 years ago
cxt 28f7390595 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 3d3d50f1ea 编辑
10 years ago
ouyangxuhua 8e359c3d94 隐藏我的组织的搜索功能
10 years ago
huang 1d5ae6d561 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang ac95e1584c 问卷删除功能
10 years ago
ouyangxuhua af981f841e 添加组织时,翻页提醒功能改善
10 years ago
cxt d83e2e36ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt d407610740 填空题
10 years ago
houxiang 4a9da97f9b modify by hx add commit_count_detail_show
10 years ago
houxiang fe3fbacdbc modify commit count show
10 years ago
huang cd2d947cb2 多项选择标准答案
10 years ago
ouyangxuhua 219774afab 将课程动态加入组织动态中
10 years ago
cxt f850a71b59 测验
10 years ago
lizanle 193471adf1 学生自己上传的资源应允许自己删除
10 years ago
huang 935b1f9f9e 大写小写问题
10 years ago
huang de17ffa605 区分答案大小写
10 years ago
huang 3efae6bde2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 8965775004 show方法修改
10 years ago
cxt 0405d4eee6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 249b15751d 新建多选题
10 years ago
huang 7f5fa7fb6f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 25344ef0de show方法
10 years ago
huang deb0f151c4 单选数字转换
10 years ago
cxt c5c16e25b6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
ouyangxuhua b231b44e81 1.项目和课程中,添加翻页提醒;
10 years ago
ouyangxuhua fc7e41ebf9 1.在项目和课程在关联和删除关联组织后,翻页能链接到正确的位置
10 years ago
lizanle 60fda5e391 火狐MathJax显示公式错误,还是不能不用图形字体
10 years ago
cxt 265fe08b2c 在线测验
10 years ago
huang 282c7f5bd2 修改添加题目相关
10 years ago
lizanle d133acbf2a 论坛帖子显示更新时间
10 years ago
lizanle 6a59e39ef1 允许学生上传资源
10 years ago
lizanle 8e55c98ccf MathJax不允许使用图片资源,不然图片太多了。有30000个左右
10 years ago
huang 02db1b7e14 问卷添加标准答案
10 years ago
huang 9cf5a92a44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 221a73309f index页面删掉无效的测试
10 years ago
cxt 452cf1c854 测验
10 years ago
cxt 2c9c87c3c6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt bb99a11c37 页面修改
10 years ago
huang d61ec92318 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang f316f43d6d 修改edit界面无法找到的问题
10 years ago
cxt 7472d959f3 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 631418a012 单选题
10 years ago
huang 3cdda2a60a 修改创建方式
10 years ago
huang 9935cfea44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 99f4483a16 删除问卷(未完)
10 years ago
cxt f68ffc99ec 保存单选题
10 years ago
cxt b3e6bf40ff Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt cc08e5e32e 保存测验信息
10 years ago
huang 4a0865ab76 添加和编辑题目
10 years ago
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
10 years ago
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置
10 years ago
huang 0e94b4f33b 解决版本库不能新建问题
10 years ago
lizanle 94831443a5 MathJax的js
10 years ago
huang 651f6565be Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 23ca20692f 问卷部分方法
10 years ago
cxt 034a92bb7b 新建测验页面
10 years ago
huang 0316bf698f exercise新增、update
10 years ago
ouyangxuhua 8aeae831b8 项目配置中添加组织后,更新组织列表,而不是隐藏
10 years ago
lizanle 7ad2e657eb 提示信息去掉感叹号
10 years ago
lizanle 1961868e5e Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 6af8bfef37 加入课程的相关系统提示加上logo
10 years ago
ouyangxuhua 6f5cb8f142 增加组织动态的过滤功能,组织动态包括项目动态和组织的动态
10 years ago
ouyangxuhua fba461f94a 增加组织模块中项目讨论区的回复功能
10 years ago
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 5400b907e6 学生测验列表
10 years ago
ouyangxuhua bd6a1a9d49 增加组织动态中的项目问题的回复框
10 years ago
ouyangxuhua 687c0c8306 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua d220dbbc9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua 10dedcb7be 增加组织成员加入时间
10 years ago
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态;
10 years ago
cxt 10ac8eaa35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt c50bcf9331 对于提交已截止的作业,作业状态由“作品提交中”改为“作品补交中”
10 years ago
houxiang 9350841d50 change by hx
10 years ago
cxt e22b4cbdeb 作业提交截止后,未提交作品的学生看到的作业动态将显示“补交作品”
10 years ago
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang ca8b62b8bd Merge branch 'szzh' into gitlab_guange
10 years ago
huang 50dfe5ce8b 修正接口 项目owner为当前用户,同步gitlab端用户
10 years ago
ouyangxuhua f5460d1126 组织动态添加项目动态
10 years ago
ouyangxuhua c9a7a94767 组织动态添加项目动态
10 years ago
ouyangxuhua 1e1c210939 组织动态添加项目动态
10 years ago
ouyangxuhua b7f12b9cde Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
ouyangxuhua 38acb4230e 组织动态添加项目动态
10 years ago
lizanle 0b2eedd3b4 成员的编辑权利错误
10 years ago
huang f32cae9012 fork fileter修正
10 years ago
lizanle 79ba840b01 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 56613b6358 增加项目的显示
10 years ago
ouyangxuhua 9bf8f6058f 动态和文章样式问题解决
10 years ago
ouyangxuhua c51491367f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua f313509d99 组织id的位置显示组织名称
10 years ago
lizanle e1a88dedbb 首页回复 会变成组织
10 years ago
lizanle 1edaed8bf1 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle b88d5e59a1 回复的时候会多出一条一模一样的内容
10 years ago
ouyangxuhua bee355e747 修复编辑组织文章显示问题;
10 years ago
huang ddbc9003c2 每个用户不能创建同名版本库
10 years ago
ouyangxuhua 36b3d0b636 修复火狐浏览器上动态显示文章的bug
10 years ago
ouyangxuhua 4471b6c485 修改组织bug
10 years ago
ouyangxuhua f4028f6c0d Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
ouyangxuhua a5a413eda0 动态查询sql错误
10 years ago
ouyangxuhua b6d785bda0 修改编辑组织文章样式问题
10 years ago
lizanle e905489157 代码被剪切了
10 years ago
ouyangxuhua dfd1e98d00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua ca770f2727 修改新建组织的提示语言
10 years ago
cxt 82541cae1c 新建作业时去掉发布日期和截止日期的label
10 years ago
huang a40e5c5b54 frok功能开发--权限还未完成
10 years ago
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq
10 years ago
sw e6cd104ead index界面以及试卷统计相关路由添加
10 years ago
ouyangxuhua 71e6a8b135 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua 022c656db6 修复项目加入组织的bug
10 years ago
sw 70c5b27a43 相关路由
10 years ago
ouyangxuhua e08039e983 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 3451ced888 添加我的组织页面及修改bug
10 years ago
Tim 183f019c04 组织样式调整
10 years ago
sw 466f3c4cc3 数据库修改以及一对一,一对多,多对多等关系的确立
10 years ago
lizanle 78ebeaee3b 批量删除提示修改
10 years ago
lizanle 465bc9bd6c 新增和删除的时候数据联动bug
10 years ago
ouyangxuhua 866c2feaa1 修改组织模块的bug
10 years ago
lizanle 28a6e09edd 资源批量删除情况
10 years ago
sw bbf087fa67 数据库的修改以及model数据关系的确定
10 years ago
lizanle e7d53f5e16 课程资源上传允许多选tag
10 years ago
ouyangxuhua 5aea2250c4 组织加入成员时,如果没有选择用户,弹窗给出提示
10 years ago
ouyangxuhua 2a5eeaa527 在组织页面左边,增加项目名称一栏
10 years ago
ouyangxuhua eb64fa7642 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 6ec27761fb 组织功能实现及缺陷修改
10 years ago
lizanle b3a234cfc6 编辑的时候也需要对文章名字限制长度
10 years ago
lizanle 99637924b4 文章标题限制长度
10 years ago
lizanle e265047ba9 搜索成员翻页靠右
10 years ago
lizanle f1b61c1581 搜索翻页后将丢失数据
10 years ago
lizanle df0051cdd4 设置 删除 编辑按钮做成项目一样的
10 years ago
lizanle c2e783d78b 设置 删除 编辑按钮做成项目一样的
10 years ago
lizanle b24fadea05 设置 删除 编辑按钮做成项目一样的
10 years ago
lizanle 6fd76eb622 删除成员要做确认
10 years ago
lizanle 368d755499 改为管理人员
10 years ago
cxt 2c5cd1a4b3 编辑作业页面添加截止日期和发布日期label
10 years ago
ouyangxuhua 7dc02d2c4f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 21275e8b7b 组织模块功能缺陷修改
10 years ago
cxt 7a93fddb83 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
Tim 7751dc9081 组织页面调整
10 years ago
cxt ab868d7b65 课程通知增加置顶
10 years ago