Commit Graph

2922 Commits (01d716d61f6ed28481ae2b1edb7c16cbad3e1f8a)

Author SHA1 Message Date
huang 146d877254 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 1a6f81f302 用户申请,区分已读和未读
10 years ago
sw 068b03cd8f Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
10 years ago
guange c413d66c44 程序作业打分
10 years ago
ouyangxuhua 71f8fca68b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua a7f2f0a6d2 项目版本库错误提示信息设置为flash.now[:error]
10 years ago
huang 06753497bb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 0746408a9d 增加用户申请加入项目消息提醒功能(管理员收到消息提醒)
10 years ago
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式
10 years ago
ouyangxuhua bff50aa769 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang ae2aa2fedd 完成消息所有逻辑功能
10 years ago
sw 2dacc882df test
10 years ago
sw e4209007b1 Merge branch 'guange_homework' into szzh
10 years ago
huang 4c73e00eaf 作品消息状态更新
10 years ago
ouyangxuhua 550b263c2c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
sw 3b24bb375a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw a29d004fdc 没有加入课程的用户进入作业列表报错
10 years ago
guange be29bcc8bd 模拟答题记入数据库
10 years ago
ouyangxuhua fb6688265c wiki删除后跳转
10 years ago
huang 103d61056d 完成功能:
10 years ago
cxt aa0c0dab83 添加“我的动态”
10 years ago
huang ecd0056f0a 1、完成消息点击记后图标不显示红点的功能。
10 years ago
huang ed5f14c9eb 添加点击对应方法
10 years ago
sw 88397d58d0 1、讨论区新建帖子时增加权限判断
10 years ago
sw 62c657a827 用户留言增加登录判断,并且删除匿名用户留言数据
10 years ago
huang b771cc0fe1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw abf053fc99 Merge branch 'develop' into szzh
10 years ago
sw 970de3374c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang b89218a1b3 消息列表添加未读消息统计和“全部设为已读”功能
10 years ago
sw 089c4ab490 1、用户只可查看自己的作业界面
10 years ago
sw 29379788fe 个人动态里回复缺陷留言增加登录判断
10 years ago
lizanle da43b00ddf Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 08fd7e125f 作业从资源库引入作者为别人的资源不能删除bug
10 years ago
cxt 55758c3c2f 筛选掉未发布的问卷动态
10 years ago
sw fe91ec1a85 1、历史数据导致项目动态中部分数据连接到课程相关页面
10 years ago
guange 921d2fc422 erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
guange 6063f39eac 修改作业的一些链接和跳转问题
10 years ago
huang f1431b27fc Merge branch 'develop' into szzh
10 years ago
huang bf2e63b7be 去掉消息界面“未读”和已读
10 years ago
guange a0c611378b 提交作业跳转报错
10 years ago
guange d07873cdf0 时间格式修改
10 years ago
guange bacb5f859b merge
10 years ago
guange a69cee4b26 老师测试功能
10 years ago
sw 5be3a9e03f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 893ae35039 新建作品、编辑作品界面修改
10 years ago
sw 6a6fbea446 提交作品样式
10 years ago
huang 8b9eabd027 迁移文件中添加打印收据
10 years ago
guange dd4e67ebdb 使用新的作业提交界面
10 years ago
huang 4c76292e5e message--viewed
10 years ago
huang 43f99c45e8 消息
10 years ago
huang 487881bb92 Merge branch 'szzh' into dev_hjq
10 years ago
huang a2079dc6e3 用户留言消息状态更新
10 years ago
huang 61455bdb4b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 87956ee48c 用户留言消息区分已读和未读
10 years ago
ouyangxuhua 192c5735cb 贴吧帖子已读更新
10 years ago
sw 3b153766f6 过滤之后点击展开更多相关BUG
10 years ago
huang 48ddee478e 默认更新为已读
10 years ago
huang 0e4019be2f 修复时间乱的问题
10 years ago
huang d980513551 添加查看通知/新闻的消息状态更新
10 years ago
huang e89fbd2c8e 过滤条件改为同种类型过滤
10 years ago
cxt d845b8373a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 21565b74fe 冲突
10 years ago
guange 8ad521d4ab merge
10 years ago
guange 41f9daed6d 编程作业放入到users controller
10 years ago
cxt d4dfd97b97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 4a1b2fbbd6 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle b2eb846a23 关于我们
10 years ago
sw 5f42ce4c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 00a8dc94c3 缺陷的回复功能
10 years ago
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计
10 years ago
sw b1de662338 讨论区回复功能,修改引用样式
10 years ago
lizanle b3e3737fb5 发布作业时从资源库选择资源功能
10 years ago
sw 84ff3450d2 在动态中回复通知动态
10 years ago
sw b3919256fa 111
10 years ago
lizanle 5b40628a5b Merge remote-tracking branch 'origin/szzh' into szzh
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
sw 7a4d562773 课程主页,项目主页 500
10 years ago
sw 8be7509b33 课程、竞赛主页跳转到个人主页
10 years ago
guange 8f426ca040 merge
10 years ago
sw 655054a8ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle ac60fdf0b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle de5dd08b55 登录之后跳到个人主页
10 years ago
sw 9437188c9b 登录界面enter键监听
10 years ago
cxt 5ddefe21b8 个人主页3080账户动态异常bug
10 years ago
lizanle 244d5165e2 登录之后跳到个人主页
10 years ago
lizanle 3a21c4e2fa 登录之后跳到个人主页
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
guange 18bfe1fc73 jquery升到1.11
10 years ago
lizanle 2b7beaeae8 上次登录的地址用户id变为当前用户id
10 years ago
sw 86e9ec068f 新建作业时,作业截止时间为空
10 years ago
cxt c650c83f82 个人主页报500、动态显示错位的bug修复
10 years ago
guange e8fe397158 added
10 years ago
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh
10 years ago
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 76ec0d5d48 资源库导入资源到作业静态页面
10 years ago
huang 5384e7eee8 消息每种类型为空的时候给出提示
10 years ago
guange 1d8fdbf8f1 可以提交答案
10 years ago
huang 9bc491227b Merge branch 'szzh' into dev_hjq
10 years ago
guange 1462ea09f3 测试代码功能完成
10 years ago
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 2fa03c3102 导入作业功能完成
10 years ago
lizanle f9651d853c 资源每页显示的个数
10 years ago
sw 007a39b5d5 作业列表的过滤查询
10 years ago
huang 9709692a08 修改消息每页的显示个数
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
sw cb5abc6d74 导入作业弹框
10 years ago
lizanle 7916ca2ee3 密码重置
10 years ago
lizanle d99c1dd72a 重置密码的base错了。
10 years ago
lizanle 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功
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 19dc9de60f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
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 e4a36b9be2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
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 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
huang 85b90f9958 消息代码清理
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 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 f43e312fbb Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle a53b9f9049 留言模块
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
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq
10 years ago
sw 47b20a7633 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw 8247a29b85 只有admin用户可以修改个人简介
10 years ago
lizanle d500ea0790 关注人数变化
10 years ago
lizanle d735eee4a3 关注和取消关注
10 years ago
lizanle 4ee571e586 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle cf12ee877e 编辑资料的时候个人说明隐藏
10 years ago
cxt fce523606c 个人主页
10 years ago
cxt e4c9f05c7b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt bd00870eba 个人主页
10 years ago
sw 56a1283033 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw d8b87ccc37 作业列表滚动到底部显示下面10条作业
10 years ago
lizanle 5c43c902c4 编辑资料css
10 years ago
lizanle 70e9d75cc6 登陆后的搜索
10 years ago
ouyangxuhua 24f26749c0 修改memo对应的memo_messages的viewed字段
10 years ago
ouyangxuhua 0056fa9db3 修改了课程问卷的link_to以及对应的course_messages的viewed字段
10 years ago
ouyangxuhua f56d9ed265 设置作业对应的forge_messages表的viewed字段
10 years ago
lizanle c360bdaf7d logout
10 years ago
lizanle 79bd438c87 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle f2e406a416 登陆注册按钮改为页面跳转
10 years ago
sw 0d9a397453 登录、未登录搜索条件选择js
10 years ago
sw c8b1bb5d64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 097d52c07a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 4915f7977e 个人动态
10 years ago
lizanle 8917a67c7c Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle d25971f546 登陆界面
10 years ago
sw c93bc5be40 作业列表效果显示
10 years ago
huang 4c974266b8 没消息显示!
10 years ago
huang 64e54cda75 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 3ecdb2940b 去掉统计信息
10 years ago
ouyangxuhua 32e67a3cb1 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 12c3f5a723 消息讨论区viewed字段更新
10 years ago
huang bff139b9a7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 0da75afc88 消息排序(公共表)
10 years ago
ouyangxuhua 354cb52339 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua d83ed09617 更新viewed字段
10 years ago
huang 5306d7e2a4 列表排序(未完)
10 years ago
sw 4bf92d0737 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw 3ea198dc3d 标题栏作业界面静态页面的添加
10 years ago
cxt 2e5916cf5e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
ouyangxuhua b7a473a1b2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
cxt 51c2f595d1 个人主页动态
10 years ago
ouyangxuhua f0483b6de8 更新新闻viewed
10 years ago
ouyangxuhua bf596d7b4b 更新新闻viewed字段
10 years ago
lizanle 5bf7aeb430 资源库css小改动
10 years ago
lizanle 39b022f696 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
lizanle 614743d8d4 登陆界面
10 years ago
huang f26ccac3b9 Merge branch 'sw_new_course' into dev_hjq
10 years ago
sw 5fcb97b990 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
sw 7f2f2c5d40 个人主页,项目更多功能
10 years ago
sw 2d75fea96b 课程点击更多按钮显示
10 years ago
lizanle 9a2e9a4ad2 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
10 years ago
lizanle 5628a43578 资源库和新版个人中心整合
10 years ago
huang 3858e87482 user留言类型
10 years ago
huang aadfd16e6a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 374c596a50 添加新图标,新base
10 years ago
ouyangxuhua b2ac4e8e1f 项目消息问题
10 years ago
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course
10 years ago
sw 08ab08d064 Merge branch 'develop' into sw_new_course
10 years ago
sw 111478ec72 Merge branch 'szzh' into sw_new_course
10 years ago
lizanle 67c5a8e9c5 分页改为了15条
10 years ago
lizanle 830815d3fd 课程资源搜索bug
10 years ago
guange 3a601bbd2c Merge remote-tracking branch 'origin/szzh' into guange_dev
10 years ago
sw cc4661a9b8 Merge branch 'szzh' into develop
10 years ago
lizanle f763fcf144 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 53c28a9b39 新成员注册的时候报错
10 years ago
sw c3bd085068 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 033aea28c5 新成员注册的时候报错
10 years ago
sw 0489b02e54 课程留言无法删除
10 years ago
lizanle f6b01b300d 资源库 全部里能看到课程资源,但是分类里边却没有。
10 years ago
huang 4e4df99bb1 处理冲突
10 years ago
sw 2a522f144e 编辑个人简介
10 years ago
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt e1fb2a6bab 个人主页动态
10 years ago
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 4928d5976e 资源库 上传以后逻辑修改
10 years ago
lizanle 8a88935b7c 资源库 只能看到自己的资源库
10 years ago
lizanle 3c6484269d 资源库 只能删除上传者为自己的资源
10 years ago
lizanle 7deafac280 资源库 修改
10 years ago
huang 840caf18f3 修改排序
10 years ago
lizanle 705d31b1d0 资源库 修改
10 years ago
cxt 4c87071765 个人动态
10 years ago
huang 29b8a9dd9d 添加项目新闻回复 消息通知
10 years ago
lizanle 0e8c1d1b66 资源库 分页
10 years ago
huang 7c7c337deb 控制界面
10 years ago
huang ff53840029 修改消息中存在的页面bug
10 years ago
lizanle 7ddf6d1e7d 资源库 多选发送
10 years ago
huang 93f44287aa jounal状态
10 years ago
huang b40122c9ee 跟新issue状态!
10 years ago
huang a15ab2c72e Merge branch 'szzh' into dev_hjq
10 years ago
lizanle f97a55e164 资源库 删除
10 years ago
huang e4dda89c07 消息---用户留言界面
10 years ago
huang b5682adcd3 添加统计数
10 years ago
huang 192f16ba79 修改memo类
10 years ago
lizanle 76c2c47adf 资源库
10 years ago
huang 6b6f6e0b0d 个人主页留言消息推送
10 years ago
huang c8399cdf58 去掉forum
10 years ago
huang d18d1a9d81 用户留言添加
10 years ago
lizanle 929da7512d 资源库最新界面修改
10 years ago
huang 425e0dd89a 公共讨论区消息页面添加
10 years ago
lizanle 0ef7d5f0fa 资源库可见性问题
10 years ago
huang d657e9f3cc 新增 公共贴吧 消息通知
10 years ago
lizanle e7f818deb9 资源库搜索问题
10 years ago
lizanle 43d57074e5 资源库
10 years ago
lizanle ae6260571b 资源库
10 years ago
huang 90661066d3 区分课程/项目讨论区
10 years ago
huang f9fc63402b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 6b55474623 作品被评阅
10 years ago
lizanle 7219586b1e 资源库
10 years ago
ouyangxuhua 3e4f726855 增加留言、指派给我
10 years ago
cxt 27ff5471ec 超级管理员新增功能页面的分页、添加超链接,添加查询条件。
10 years ago