Commit Graph

7655 Commits (dfed4885de1fbb8e1eafc4d18d7a1f07df717a17)

Author SHA1 Message Date
guange 41f9daed6d 编程作业放入到users controller
10 years ago
huang 7361f40b0c 修改项目资源时间显示跳转错误页面问题
10 years ago
sw c01b71739a 增加加载更多按钮
10 years ago
cxt d4dfd97b97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt d0c4bb9470 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw eff6d6cafe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw edb7173d83 加入课程、新建课程、新建项目按钮样式
10 years ago
lizanle 4a1b2fbbd6 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle b2eb846a23 关于我们
10 years ago
cxt 756d703b5a 选择框默认显示文字类似于“请选择发布作业的课程”,点击即弹出供选择的课程列表,课程名称后还需要显示开课学期
10 years ago
sw c09478c73f 作业列表界面和动态列表界面显示不一致
10 years ago
sw 5f42ce4c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 8b9ee2260a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
sw 0994ae9f07 项目讨论区回复功能
10 years ago
huang fede611fea 鼠标经过显示内容效果
10 years ago
sw 00a8dc94c3 缺陷的回复功能
10 years ago
lizanle a5e39a1049 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计
10 years ago
suntao acb46d520c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt a008d9d834 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 8a286bb8a8 去掉截止日期的标签
10 years ago
suntao ae3f56c758 提交作业界面对齐
10 years ago
sw b1de662338 讨论区回复功能,修改引用样式
10 years ago
lizanle a78128f5ac 搜不到资源的时候 改为没有数据可以展示
10 years ago
lizanle 798326d6ef Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle b3e3737fb5 发布作业时从资源库选择资源功能
10 years ago
sw 62360175d1 课程通知回复时,所有回复框都会提交
10 years ago
cxt b89a80d04e 截止日期
10 years ago
sw 84ff3450d2 在动态中回复通知动态
10 years ago
cxt dd6e3e5f82 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 1e320e63c6 底部导航的论坛反馈改为贴吧交流,帮助中心版权信息的换行修复
10 years ago
suntao a277322873 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao fe664b5e5c 回复模块调整
10 years ago
ouyangxuhua 86ced0e290 讨论区回帖消息应该在RE:后面显示回帖内容
10 years ago
cxt fdfcefd1ed 鼠标移到个人主页的课程列表时,显示tip:课程名,课程学期
10 years ago
cxt e128a0e033 当鼠标移到新建课程/项目的图标按钮上时,给出相应的tip
10 years ago
ouyangxuhua 284d33b096 讨论区回帖消息显示回帖内容
10 years ago
sw 147afc09a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 5472f2d45f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw b3919256fa 111
10 years ago
suntao 1d1d2f738d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao acf5db7067 placeholder显示等
10 years ago
cxt ac419cef87 去掉课程/项目搜索列表的搜索框
10 years ago
cxt 90b8d25424 鼠标点入“请输入作业标题”后,才显示kindeditor及其下面的内容,及导入作业右侧的时间框,应该显示“提交截止日期”的tip
10 years ago
cxt 1113a7938c 修复点击空白处返回新建课程/项目的页面
10 years ago
huang 90d93202cd Merge branch 'szzh' into dev_hjq
10 years ago
huang dbc0688213 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang b5c0d03590 添加迁移
10 years ago
ouyangxuhua 4581f9439a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 5ee53b824d 项目中上传资源添加至动态中
10 years ago
cxt 4ab91984f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt fa57a6c889 主页动态的样式修改
10 years ago
suntao ac353841b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao d3869b03cd 资源库版面样式调整
10 years ago
cxt 7d6f952737 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 118b731dc4 点击动态链接进入相关列表
10 years ago
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao b0ff7f0ee2 页面间距调整,头像大小调整
10 years ago
cxt 23c1ac5a4a 项目问题的动态内容显示超出边框
10 years ago
cxt 8345a9d94e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt fedc125731 附件名称在可用的范围内尽可能显示全
10 years ago
lizanle 5b40628a5b Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle e9b501058b 上传以后资源数改变
10 years ago
lizanle 9ca1234324 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework
10 years ago
huang f6baf03470 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang 3807c4ea2a Merge branch 'szzh' into dev_hjq
10 years ago
huang e652e92217 新增消息迁移
10 years ago
sw 7a4d562773 课程主页,项目主页 500
10 years ago
sw ab173fb704 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 8be7509b33 课程、竞赛主页跳转到个人主页
10 years ago
sw c416a312cf 取消发布作业时间
10 years ago
cxt 96021bee73 项目讨论区的回复不显示用户名称
10 years ago
sw 09a994f76a 职称增加副教授等职称
10 years ago
sw ca0c7a4fb0 个人主页职称
10 years ago
guange 8f426ca040 merge
10 years ago
guange 85ee2b86cd .
10 years ago
cxt 6c09e41a09 个人主页课程讨论区动态报错
10 years ago
sw bfd13bf98a 课程回复按钮样式
10 years ago
sw faea706683 Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
10 years ago
sw f81bab6319 课程回复
10 years ago
sw 655054a8ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 43170c696c 迁移总表时间
10 years ago
suntao ecd355df0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao fc47b793ee 动态块间距调整
10 years ago
lizanle ac60fdf0b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 1e9f5cebd2 首页查询问题
10 years ago
lizanle de5dd08b55 登录之后跳到个人主页
10 years ago
cxt cb88e406d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt a7f161804e 描述和回复超出边框
10 years ago
sw 9437188c9b 登录界面enter键监听
10 years ago
suntao 3776689661 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao efe5c1e3f4 课程宽度调整
10 years ago
cxt d48cc8073a Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
cxt 5ddefe21b8 个人主页3080账户动态异常bug
10 years ago
sw 6d768100f8 输入为空不提交表单
10 years ago
huang 2a17cfc741 Merge branch 'szzh' into dev_hjq
10 years ago
huang 353e2f5d18 添加课程消息迁移
10 years ago
sw 63c7ea8d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 98d533e8f9 1、整理迁移文件
10 years ago
lizanle 244d5165e2 登录之后跳到个人主页
10 years ago
lizanle 2962408c06 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 3a21c4e2fa 登录之后跳到个人主页
10 years ago
cxt 250d7a48dc 主页动态页面的刷新
10 years ago
sw 6cb21d3430 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 73ffbb7dfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw c0daebd75c 上传图片js
10 years ago
sw b65243ba62 添加关注、取消关注js刷新
10 years ago
sw a2ec65a0c9 添加关注与取消关注
10 years ago
cxt b30a07d651 个人主页动态
10 years ago
sw 498775b0a8 登录界面多了一个<
10 years ago
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao 5e25b64004 提交按钮对齐
10 years ago
lizanle acbf58837a Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle ad8bd379a1 用户资源过滤
10 years ago
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 4e1766d578 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 5f4b879fb7 修改消息过滤条件
10 years ago
sw e455f93ee1 上传图片;浏览图片按钮
10 years ago
guange 18bfe1fc73 jquery升到1.11
10 years ago
lizanle ca2b20bd99 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 92298160a7 搜索后的资源总数在搜索框右边展示
10 years ago
huang 8e70bc22e0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang f438d300dd 消息数据迁移(未完)
10 years ago
suntao 1351742919 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao 977f81e031 关注和取消关注,导航圆角
10 years ago
lizanle 577376a037 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 2b7beaeae8 上次登录的地址用户id变为当前用户id
10 years ago
ouyangxuhua 1957100062 用户关注ajax刷新
10 years ago
sw f01b5681a5 增加项目、课程的收起
10 years ago
ouyangxuhua f99097f3d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua a111b9a3fd 用户关注ajax刷新
10 years ago
sw e5bf355a17 导航栏搜索支持enter键
10 years ago
suntao 5f3532ac14 头像部分修改
10 years ago
sw 7263598851 访问问卷报500
10 years ago
sw 86e9ec068f 新建作业时,作业截止时间为空
10 years ago
sw 00ab2bcbd4 作业名称过长超出边框
10 years ago
lizanle 5e485e5175 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 878f48079d 全选框在翻页后也应该重置为不选
10 years ago
lizanle eef96701dd Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 60b429b13d 发送成功不给提示
10 years ago
sw 2d00eb982c 取消跳转到个人主页
10 years ago
suntao 9d638b705a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao 2342d1c23a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt bcec8eb35e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt c650c83f82 个人主页报500、动态显示错位的bug修复
10 years ago
suntao ada04e5e63 个人主页头像模块改动
10 years ago
huang 6287f9b39e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle bc186776d8 资源移动弹出框减少留白
10 years ago
sw 51bf1cd678 作业搜索支持enter键
10 years ago
huang 6406d5a284 解决邮件内容空的问题
10 years ago
lizanle 53b150486d Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 789b62940b 资源名称过长会覆盖的问题
10 years ago
huang c1851a74c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 170cdad3e3 解决消息过滤404问题
10 years ago
cxt 69178f1522 个人主页
10 years ago
cxt 27b8d85cc5 个人主页
10 years ago
sw 7ec10d7b39 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 3f61a908d1 部分界面样式调整
10 years ago
cxt 36860e8c4f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt e448d2c05f 个人主页
10 years ago
guange e8fe397158 added
10 years ago
sw aa06c3ac03 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 49972ca476 样式调整,取消资源库选择资源
10 years ago
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh
10 years ago
huang e193cb0f2d 消息列表界面新样式
10 years ago
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 148a4e2479 发布作业样式
10 years ago
sw bbb8e5a062 老师发布作业取消功能
10 years ago
sw 76ec0d5d48 资源库导入资源到作业静态页面
10 years ago
sw 02f7538200 个人描述为英文时不换行
10 years ago
huang 331592d78a Merge branch 'szzh' into dev_hjq
10 years ago
huang 5384e7eee8 消息每种类型为空的时候给出提示
10 years ago
suntao 4392ecdcd7 消息格式更改
10 years ago
guange 1d8fdbf8f1 可以提交答案
10 years ago
suntao e12bef1126 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao a19692a0c6 个人主页左侧修改
10 years ago
huang 9bc491227b Merge branch 'szzh' into dev_hjq
10 years ago
huang d9df8aae28 1。缺陷状态更新后,不同状态变更在消息列表中显示方式
10 years ago
suntao 02120c778f 样式修改
10 years ago
guange 1462ea09f3 测试代码功能完成
10 years ago
suntao c0477fda99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
suntao b6d58b1b58 样式调整
10 years ago
sw 43d9697195 发布作业增加块的显示
10 years ago
sw 2fa03c3102 导入作业功能完成
10 years ago
lizanle 6dde8d1ea6 资源库弹出框位置优化
10 years ago
lizanle f9651d853c 资源每页显示的个数
10 years ago
sw 007a39b5d5 作业列表的过滤查询
10 years ago
huang 9709692a08 修改消息每页的显示个数
10 years ago
lizanle d3f441d4da 可拖动的资源弹出框
10 years ago
guange 5fb2989427 Merge remote-tracking branch 'origin/szzh' into homework
10 years ago
sw c5ad5a3a5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 1b9da8d963 消息添加分页功能
10 years ago
lizanle 149ac07cf9 去掉重复的css,
10 years ago
sw cb5abc6d74 导入作业弹框
10 years ago
lizanle 7916ca2ee3 密码重置
10 years ago
sw cc76c13700 资源库样式
10 years ago
lizanle b7daa643c8 资源库空白处单击也要隐藏弹出框
10 years ago
lizanle a4e30d119d 删不掉资源的提示
10 years ago
lizanle d99c1dd72a 重置密码的base错了。
10 years ago
lizanle cff93331b2 更改登录首页的标点符号
10 years ago
lizanle 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功
10 years ago
huang a7eff50c61 消息留言发送:回复东家,回复人和东家只能一人收到消息
10 years ago
lizanle 0a898342d9 登录按钮可以用enter键
10 years ago
sw 8cd6c7d2a0 Merge branch 'guange_dev' into szzh
10 years ago
lizanle 41a8f9d6a2 底部去掉marginBottom:10px
10 years ago
guange 3ae4d01284 .
10 years ago
guange b9e08b22cd Merge remote-tracking branch 'origin/szzh' into guange_dev
10 years ago
guange 631283ae79 remove grack
10 years ago
sw ed3be27687 消息界面样式
10 years ago
sw 19dc9de60f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt d1577028be Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
lizanle 5f23244742 忘记密码
10 years ago
cxt a7ce1168db Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt caec5e5490 个人主页动态
10 years ago
sw db70425d99 Merge branch 'szzh' into sw_new_course
10 years ago
sw 347298124e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw e4a36b9be2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw 01c8ee3898 1、个人主页新建课程、新建项目、加入课程功能添加
10 years ago
lizanle 82b86ea14f Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle 733876743e 服务协议 忘记密码
10 years ago
sw dafc128f34 增加部分默认参数的设置
10 years ago
sw 650d0c8cb5 匿评分配数量默认为3
10 years ago
sw 5b9c9312f5 留言界面样式修改
10 years ago
sw afeaecc478 作业列表增加标题
10 years ago
sw b7cbb9b0c2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw 049e27f15f 发布作业功能
10 years ago
cxt 7c3544dfec 个人主页动态
10 years ago
cxt 706415dc6e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 2124b3c392 个人主页动态缺陷修复
10 years ago
huang 85b90f9958 消息代码清理
10 years ago
lizanle 9e9de44397 服务协议
10 years ago
lizanle ba9a64360e Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle 65b5b467d4 服务协议
10 years ago
huang ef74d129c5 消息通知回复链接样式
10 years ago
huang a54de0c8fb Merge branch 'dev_hjq' into sw_new_course
10 years ago
lizanle ccfd69602c 服务协议
10 years ago
huang b824c3fa46 1、去掉多余的代码
10 years ago
huang 6a986b98d9 Merge branch 'sw_new_course' into dev_hjq
10 years ago
lizanle 5ec24913bb 留言背景色 留言头
10 years ago
lizanle f43e312fbb Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle a53b9f9049 留言模块
10 years ago
sw af2434809b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
huang 7340a664f2 链接颜色
10 years ago
cxt eed1939d2f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 048319ef8e 个人主页
10 years ago
sw 4fe3ba2442 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw a08d32d0f3 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw e2869faa08 日历选择器的样式调整
10 years ago