Commit Graph

564 Commits (alan_develop)

Author SHA1 Message Date
sw a29d004fdc 没有加入课程的用户进入作业列表报错
10 years ago
guange be29bcc8bd 模拟答题记入数据库
10 years ago
huang 103d61056d 完成功能:
10 years ago
cxt aa0c0dab83 添加“我的动态”
10 years ago
huang ecd0056f0a 1、完成消息点击记后图标不显示红点的功能。
10 years ago
huang ed5f14c9eb 添加点击对应方法
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
huang b89218a1b3 消息列表添加未读消息统计和“全部设为已读”功能
10 years ago
sw 089c4ab490 1、用户只可查看自己的作业界面
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
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 bacb5f859b merge
10 years ago
guange a69cee4b26 老师测试功能
10 years ago
huang 8b9eabd027 迁移文件中添加打印收据
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 87956ee48c 用户留言消息区分已读和未读
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
sw 5f42ce4c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计
10 years ago
lizanle b3e3737fb5 发布作业时从资源库选择资源功能
10 years ago
sw b3919256fa 111
10 years ago
cxt 5ddefe21b8 个人主页3080账户动态异常bug
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
sw 86e9ec068f 新建作业时,作业截止时间为空
10 years ago
cxt c650c83f82 个人主页报500、动态显示错位的bug修复
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
huang 9bc491227b Merge branch 'szzh' into dev_hjq
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
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 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功
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 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
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 8247a29b85 只有admin用户可以修改个人简介
10 years ago
lizanle d735eee4a3 关注和取消关注
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 70e9d75cc6 登陆后的搜索
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 4915f7977e 个人动态
10 years ago
sw c93bc5be40 作业列表效果显示
10 years ago
huang 4c974266b8 没消息显示!
10 years ago
huang 3ecdb2940b 去掉统计信息
10 years ago
huang 0da75afc88 消息排序(公共表)
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
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 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
sw cc4661a9b8 Merge branch 'szzh' into develop
10 years ago
lizanle 53c28a9b39 新成员注册的时候报错
10 years ago
lizanle 033aea28c5 新成员注册的时候报错
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
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
lizanle 76be15f79b 资源库
10 years ago
sw 752fe93d72 已登录用户header完成
10 years ago
huang 4bc0e0eb69 项目模块消息添加
10 years ago
lizanle 25460cd255 资源库
10 years ago
huang 71f6927145 issue控制层消息
10 years ago
huang dd1dd143f6 添加项目缺陷消息显示
10 years ago
huang 472254019e 优化
10 years ago
huang fe077a27fb 消息查询代码优化
10 years ago
huang 239cba54d9 区分未读消息和已读消息
10 years ago
huang a71ff944c0 消息排序
10 years ago
lizanle 89b9a5c09d 资源库
10 years ago
huang 64e1d88285 去掉项目消息提示
10 years ago
huang 9b98bdcf5c 1、消息看过则不提示(方法实现)
10 years ago
huang ed8c4ac906 不同类型消息发送
10 years ago
huang 17fad1f291 课程(所有消息)--发布作业、新闻、问卷界面
10 years ago
huang 7ea0fac774 1。发布作业消息提醒
10 years ago
huang 2c865069d3 所有消息显示功能
10 years ago
sw 29092db557 我的课程/我的项目按照课程/项目最新动态的时间排序
10 years ago
huang 82747a7690 留言添加消息提示
10 years ago
sw a667d97768 进入其他人个人主页时,点击他创建的课程报错
10 years ago
sw 9c704b7dc1 个人主页留言静态页面
10 years ago
sw 9728277005 1、课程动态、每次项目动态显示13条
10 years ago
sw 5dc3eba27a 我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
10 years ago
sw ce17cb1da0 个人主页,TA的课程显示和课程数量、课程列表不匹配
10 years ago
yutao 59c1810d6b 个人主页
10 years ago
yutao 2efb4833f2 个人主页
10 years ago
yutao 8d858cccfc 个人主页
10 years ago
yutao addf3604ec 个人主页
10 years ago
yutao 87ab758ec5 个人主页->动态
10 years ago
yutao 00c50d8114 个人主页->访客
10 years ago
yutao b7c4449f4b 个人主页
10 years ago
yutao 02d09c84b4 个人主页->留言
10 years ago
yutao 5c011fd342 个人主页
10 years ago
sw 8b0eb21d08 关注需求功能取消,部分用户进入个人主页报错
10 years ago
sw bd6a057008 老师布置作业加入个人动态
10 years ago
yutao 4b58699ee9 修复bug#2270 :forge/course主页--搜索用户无任何作用
10 years ago
guange f94184bc81 个人动态权限部分性能优化
10 years ago
guange 5a876d9df1 邮件发送时,单个收件人会报错
10 years ago
guange 02e83ea776 将邮件发送放到后台进程中
11 years ago
sw 88d6b25ace 1、修改意见反馈图片
11 years ago
sw bdd1980876 修复个人动态首页报错
11 years ago
z9hang 6ca853edc7 1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
11 years ago
sw c6788e2f40 修复首页报错
11 years ago
sw 945b9ff9cf 修复进入我的动态,关注人没有进行权限过滤的BUG
11 years ago
sw ff2b4c610c 1、修改用户动态每页显示条目不正确
11 years ago
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
11 years ago
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存
11 years ago
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
11 years ago
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 00c0ddc600 admin查看course和user列表
11 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
11 years ago
alan ade0720331 邮件系统界面重置
11 years ago
alan b9ea3e589e 修改《邮件系统》页面
11 years ago
z9hang 0f9915fc2a Merge branch 'szzh' into api
11 years ago
z9hang 6efe9ff5c6 注释掉无用的方法调用
11 years ago
alan 6c9f5136c0 修改《竞赛主页显示错误》
11 years ago
alan 53b57d4c53 修改《个人主页积分弹框显示错误》bug
11 years ago
sw ee1df78f13 课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
11 years ago
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw b512bc53e9 修改用户搜索无法精确搜索的bUG
11 years ago
alan 629641d065 《调整学生列表页面》和《优化个人主页查询》
11 years ago
sw 73afb7e6c8 调用作业课程时首先判断该作业的所属课程是否存在
11 years ago
alan c99af4cb7b 修改《个人主页出现没权限访问链接》bug
11 years ago
alan d81240e63c 修改《关注老师后,老师发布的作业都会在我主页的动态中显示出来,若我未加入该课程但感兴趣点击后返回403页面,提示不够人性化》bug
11 years ago
z9hang 1494821b67 用户搜索接口
11 years ago
sw fef005d2d3 修改搜索用户报错
11 years ago
moon e4e4c94d53 封掉所有列表入口,及页面中更多入口
11 years ago
alan e9d75bde6f 《修改资料》页面:工作单位为不必填
11 years ago
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b141db6624 用户留言修复
11 years ago
alan 1d76d559dd 添加功能<用户搜索的问题>
11 years ago
z9hang f15c870053 1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
11 years ago
z9hang e4ff85894d 1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
11 years ago
z9hang 57776d67c5 优化代码
11 years ago
sw 602982a124 龚乐鑫修改意见4:redirect_to后使用 url
11 years ago
sw 8cd3dd0287 1.#1249 未登录和非本人进入用户课程界面时隐藏课程不显示
11 years ago
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang c9f6259587 空数据库时部分数据没有,添加非空判断
11 years ago
z9hang 74ba4384b1 1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改(原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset,修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象,注意:尚需测试)
11 years ago
z9hang 746022506d 用户列表排序问题、项目得分不一致问题
11 years ago
z9hang 683cd9f918 个人积分修改
11 years ago
z9hang 2ad51d7afe 修改引用的留言为不能修改
11 years ago
z9hang 03b212e363 首页定制,是否显示课程,竞赛
11 years ago
z9hang 5800cf5fff 修正登陆错误
11 years ago
z9hang c60188038e 得分机制修改
11 years ago
yanxd bf9a992399 活跃度排序不一致
11 years ago
yanxd ee95d9b115 user_activity page
11 years ago
yanxd cccbd941ce 用户删除,管理界面用户去排序,删除后跳转,去无效参数
11 years ago
z9hang dee09aad75 修复导航bug
11 years ago
z9hang 513fd32ec5 修复查看个人动态无权限bug
11 years ago
yanxd fb138d1593 remove user_activities path, 3path bug.
11 years ago
yanxd 472b61fefe 删除了不能通过的测试,修改user_activities。所有原路由测试可以通过。
11 years ago
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
11 years ago
yanxd df848ca756 print tag exception, course name valid test.
11 years ago
nwb 615b3ac2ac 课程界面调整
11 years ago
nwb 6a65b2a84b 去掉测试代码
11 years ago
nwb b60a0ddf59 1.添加给gitlab项目新增用户及赋权限接口
11 years ago
nwb 3d8571b59e 1.实现新增gitlab用户接口
11 years ago
nwb 6dcc50e60b 添加gitlab创建项目(版本库)接口
11 years ago