Commit Graph

1332 Commits (alan_develop)

Author SHA1 Message Date
huang 9d7bc17115 Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua ab4d0e4678 组织界面增加分栏
10 years ago
huang c72cf55564 Merge branch 'develop' into szzh
10 years ago
cxt 8fe53468e1 作品追加附件
10 years ago
ouyangxuhua 2855c0e409 修改项目动态,使其与课程动态及个人动态的样式一致,包括有回复框、过滤菜单、宽度、间距等
10 years ago
lizanle 6553559929 发送消息
10 years ago
cxt 77e96af78f 还原分组作业
10 years ago
cxt 9c4c90e066 Merge branch 'develop' into cxt_course
10 years ago
cxt f90ff781ab 学生提交作品页面的合作成员弹窗
10 years ago
ouyangxuhua cf41b13f3a 增加组织表和组织课程表的关联删除
10 years ago
lizanle 1103a114a0 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle b2bca65025 分片默认为5
10 years ago
guange 52a0da83c4 匿名用户留言问题.
10 years ago
ouyangxuhua 6f9c89d67b 1.更改首页内容,不显示作者等信息,增加取消首页、编辑首页、删除首页等功能;
10 years ago
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 96b704e191 所有者的更新时间随着被拥有者的改变而改天
10 years ago
lizanle 34ac56e0a0 attachment index_document
10 years ago
lizanle e728dd55eb Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
10 years ago
huang ae9f1c704a 500问题
10 years ago
lizanle e710f443c2 全站搜索
10 years ago
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange
10 years ago
huang 1cc6e305ed 完成新功能模块开发:
10 years ago
huang 042b197767 课程英雄榜界面调整
10 years ago
lizanle 7cb39d1754 全站搜索
10 years ago
lizanle ee47187a61 全站搜索
10 years ago
huang 061a1f602a 效果实现
10 years ago
huang aca7684414 课程英雄榜
10 years ago
lizanle dcd441a9db 全站搜索
10 years ago
lizanle 4efb660214 全站搜索
10 years ago
huang c8b1cae947 建立贡献榜表及相关关联
10 years ago
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange
10 years ago
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course
10 years ago
ouyangxuhua 6068867670 项目动态和组织动态删除后,删除相应的组织动态
10 years ago
ouyangxuhua a57260aae6 修改当“Message”回复对应的组织动态
10 years ago
ouyangxuhua 5cfc8c2f8d 编辑文章后,或者回复文章后,更新组织动态的更新时间
10 years ago
ouyangxuhua 219774afab 将课程动态加入组织动态中
10 years ago
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
10 years ago
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态;
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 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
sw 70c5b27a43 相关路由
10 years ago
sw 466f3c4cc3 数据库修改以及一对一,一对多,多对多等关系的确立
10 years ago
ouyangxuhua 866c2feaa1 修改组织模块的bug
10 years ago
sw bbf087fa67 数据库的修改以及model数据关系的确定
10 years ago
ouyangxuhua 6ec27761fb 组织功能实现及缺陷修改
10 years ago
ouyangxuhua 21275e8b7b 组织模块功能缺陷修改
10 years ago
cxt ab868d7b65 课程通知增加置顶
10 years ago
ouyangxuhua a3443ba968 组织模块功能实现
10 years ago
lizanle 94367eee82 Merge branch 'dev_zanle' into szzh
10 years ago
cxt 2a82f33227 个人首页的留言动态显示不合理
10 years ago
lizanle 2e092b0d04 论坛字符允许扩大为30000个字符,超过两万个字符不允许提交
10 years ago
lizanle 1edd87f9e0 论坛字符允许扩大为20000个字符
10 years ago
lizanle 4b272b6b9c 论坛字符允许扩大为40000个字符
10 years ago
ouyangxuhua 283af137c6 组织模块动态及配置
10 years ago
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器;
10 years ago
guange be25a57eaf 同步用户bug解决
10 years ago
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 6dcc97d5d1 添加作业的发布功能
10 years ago
cxt c4816a0414 名字为空的用户创建博客时博客名称为登录名
10 years ago
lizanle ac82910aa5 大纲
10 years ago
lizanle 76ac5a49f2 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 788e900d4a 个人博客发博文也要显示动态
10 years ago
huang 4c61e7490b Merge branch 'develop' into gitlab_guange
10 years ago
lizanle 07a2263b16 Merge branch 'szzh' into dev_zanle
10 years ago
ouyangxuhua b0b1a27908 1.用户请求加入课程成为老师或者教师时,给课程创建者发送邮件;
10 years ago
lizanle eaf4ad354f Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 2a76461cd1 简单博客功能
10 years ago
cxt 7e21c00aed 添加作业的回复功能
10 years ago
guange d802992e96 merge
10 years ago
guange 11d1cac40d 可以通过gitlab创建项目
10 years ago
lizanle 0fffed55a6 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle a817c3b81e 添加身份
10 years ago
huang 9e7adaf5bc Merge branch 'dev_hjq' into szzh
10 years ago
ouyangxuhua 87b4c83247 修改不能参与匿评消息的关联删除;
10 years ago
huang 147cdf3018 Merge branch 'szzh' into gitlab_guange
10 years ago
huang 5a5cf430d3 0
10 years ago
huang af4523815c 课程从公开改成私有
10 years ago
huang 1cfa8326aa 解决课程作业500问题
10 years ago
huang a8f5a7ea48 Merge branch 'szzh' into dev_hjq
10 years ago
huang 74284e1e71 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 7898208b16 私有课程上传资源都为私有
10 years ago
ouyangxuhua 4deeaa0f34 1.增加消息:用户迟交作业时,发送不能参与匿评的消息;
10 years ago
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange
10 years ago
cxt caa278d9f5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 464fc461ea Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle b3d15b886a 学校的查询与现实问题重做
10 years ago
huang 554927d517 删除项目的时候,项目动态级联删除
10 years ago
cxt 8abc97ae84 个人主页添加个人留言动态
10 years ago
cxt b9b7f6fa9e 个人主页留言动态的实现
10 years ago
huang 73898953d9 project表添加字段,记录project对应gitlba中project id
10 years ago
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange
10 years ago
huang 2768317d08 Merge branch 'szzh' into dev_hjq
10 years ago
huang 654ebfca46 项目邀请添加:姓、名、性别
10 years ago
huang 0064aa4278 系统消息不消失
10 years ago
huang 88b8854ed7 修改吧主和发帖人消息重复的问题
10 years ago
huang 1eac300fb7 去掉打印结果
10 years ago
huang 3f6d64877a 1、老师发布作业自己能收到
10 years ago
huang 5b0738a4cb 匿评启动失败邮件通知:实现程序及界面
10 years ago
huang 5f26e331c6 缺陷截止时间到了消息通知
10 years ago
huang 0a1798eb0b Merge branch 'szzh' into dev_hjq
10 years ago
huang c3422460ce 匿评失败邮件发送框架
10 years ago
huang ba569403c3 1、匿评关闭/开启发送对象为所有成员
10 years ago
huang 2873412d1a 修改邮件--每天发送-》内容为空的问题
10 years ago
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 8c84179650 修改issue更新消息重复提示的问题
10 years ago
lizanle f54149a5b7 发送动态 消息会重复
10 years ago
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 223bac373f 课程动态的数据迁移
10 years ago
huang e15ea06e2a 修改邮件标题
10 years ago
guange 08eecbd5ec merge
10 years ago
huang 20465764a7 Merge branch 'szzh' into dev_hjq
10 years ago
huang fcf34b5918 修复项目配置中“私有” “公开”问题
10 years ago
guange 0b4c8b05f1 JAVA语言支持
10 years ago
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh
10 years ago
huang 99473c6880 Merge branch 'szzh' into dev_hjq
10 years ago
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle d6c763edb0 取消 和 新建 贴吧的按钮都会清空贴吧表单
10 years ago
sw 50817c3d64 编译错误时 计算系统评分不正确
10 years ago
huang 200861cfef 完成issue点对点消息通知
10 years ago
huang 48b93f2113 项目缺陷消息点对点发送
10 years ago
huang b49d19cdb2 添加注释
10 years ago
sw a54a51c984 Merge branch 'guange_homework' into szzh
10 years ago
huang 961b2bd564 开启/关闭匿评邮件通知
10 years ago
guange c99222820e 加入了python语言支持
10 years ago
huang 810c0d8fe5 作业开启/关闭匿评邮件通知
10 years ago
huang fb76bc8f9a 完成项目邀请消息通知及对应页面
10 years ago
sw 715dc28187 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw ec4c7f531d 匿评作业成绩计算错误
10 years ago
sw 1d39df5469 C改为大写、编程属性设置的修改
10 years ago
huang cfea5e9c89 邀请已注册用户 消息邀请信息
10 years ago
huang f041c80d0a Merge branch 'szzh' into dev_hjq
10 years ago
huang f823046bc3 完成课程留言点对点逻辑结构
10 years ago
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 4b83265508 1、编程作业可以修改、删除
10 years ago
huang 0fead3b801 1、课程留言发送对象为老师
10 years ago
cxt 7254cf4689 项目缺陷的属性变化时更新动态表中相应缺陷的最后更新时间
10 years ago
sw 9c20368274 1、系统评分的时候对成绩进行赋值
10 years ago
huang 9324d45e2c 系统消息发布添加标题功能
10 years ago
huang d00ad2e14d 1、作业截止时间邮件通知
10 years ago
ouyangxuhua 5155e8794f 将课程留言加入消息队列
10 years ago
huang b0ccf9037a 邮件邀请:
10 years ago
huang 295921c89d 邮件:邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
10 years ago
huang 4a7d3c9072 系统消息增加长度
10 years ago
cxt dbdd68f45d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 585818fe7a 讨论区动态重复出现
10 years ago
huang 27fde3f642 Merge branch 'szzh' into dev_hjq
10 years ago
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq
10 years ago
huang 8c0f9d24f8 系统消息没保存成功添加验证
10 years ago
guange e9f9dd44b9 编程作业的修改功能搞定
10 years ago
huang c0437ae992 作业截止时间提醒界面!
10 years ago
ouyangxuhua 0bb8b175e6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua 9e61ceefa9 系统消息修改
10 years ago
huang 92a3d78dcc 完成作业截止定时发送消息
10 years ago
huang 13397363db Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
huang 66251c8d30 添加功能:管理员界面发送系统消息
10 years ago
ouyangxuhua 20bef515da issue周报发送消息给所有管理员
10 years ago
guange c413d66c44 程序作业打分
10 years ago
huang 0746408a9d 增加用户申请加入项目消息提醒功能(管理员收到消息提醒)
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 b2e25e8afc Merge branch 'szzh' into dev_hjq
10 years ago
huang c579ee51fe 增加点击时间表
10 years ago
sw 78cfed2b68 缺陷列表过滤修改
10 years ago
huang a30ee2cb10 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang 87387273d8 解决消息链接点击一次多一条的问题
10 years ago
sw fe91ec1a85 1、历史数据导致项目动态中部分数据连接到课程相关页面
10 years ago
huang dd06aa3a92 添加为空判断
10 years ago
huang 487881bb92 Merge branch 'szzh' into dev_hjq
10 years ago
huang fede611fea 鼠标经过显示内容效果
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 5ee53b824d 项目中上传资源添加至动态中
10 years ago
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework
10 years ago
guange 8f426ca040 merge
10 years ago
huang 43170c696c 迁移总表时间
10 years ago
huang 2a17cfc741 Merge branch 'szzh' into dev_hjq
10 years ago
huang 353e2f5d18 添加课程消息迁移
10 years ago
sw 98d533e8f9 1、整理迁移文件
10 years ago
guange 18bfe1fc73 jquery升到1.11
10 years ago
huang f438d300dd 消息数据迁移(未完)
10 years ago
guange e8fe397158 added
10 years ago
huang d9df8aae28 1。缺陷状态更新后,不同状态变更在消息列表中显示方式
10 years ago
guange 1462ea09f3 测试代码功能完成
10 years ago
huang a7eff50c61 消息留言发送:回复东家,回复人和东家只能一人收到消息
10 years ago
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq
10 years ago
huang 1dce1a2a4c 老师更新作品评阅消息通知
10 years ago
huang 627ca059ca 解决issue的更新
10 years ago
sw ffe40b399d 个人动态表重构
10 years ago
huang 9096fca298 留言消息发送策略
10 years ago
huang a83fc1c8d8 0
10 years ago
huang 90c199f15a 缺陷更新区别新建
10 years ago
huang 5306d7e2a4 列表排序(未完)
10 years ago
huang 7961e3db6f 建立公共表
10 years ago
huang d575ce5e5f 消息公共表
10 years ago
sw 111478ec72 Merge branch 'szzh' into sw_new_course
10 years ago
sw 0489b02e54 课程留言无法删除
10 years ago
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 604fe40f84 poll after create
10 years ago
huang 5594295c9e 添加问题更新策略
10 years ago
sw 2db6696fd4 个人动态的级联新增和级联删除
10 years ago
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle
10 years ago
huang 953817800a 问卷发布后才能提交
10 years ago
huang 580735ef79 修改删除的关联的500问题
10 years ago
huang ef45e41a40 新消息提醒。表情插入
10 years ago
huang 893c1c753f 修复留言嵌套回复问题
10 years ago
huang 29b8a9dd9d 添加项目新闻回复 消息通知
10 years ago
huang ff53840029 修改消息中存在的页面bug
10 years ago
huang 6b847e27d9 修正问题
10 years ago
huang e4dda89c07 消息---用户留言界面
10 years ago
sw b52f607b68 用户动态 = 参与课程动态 + 参与课程动态
10 years ago
huang b5682adcd3 添加统计数
10 years ago
huang 192f16ba79 修改memo类
10 years ago
huang 6b6f6e0b0d 个人主页留言消息推送
10 years ago
huang c8399cdf58 去掉forum
10 years ago
huang d18d1a9d81 用户留言添加
10 years ago
huang 2d282f73cb 项目讨论区
10 years ago
huang d657e9f3cc 新增 公共贴吧 消息通知
10 years ago
huang 6b55474623 作品被评阅
10 years ago
huang 4bc0e0eb69 项目模块消息添加
10 years ago
lizanle 89b9a5c09d 资源库
10 years ago
huang fc244982bc 处理冲突
10 years ago
huang 9a695b2d09 Merge branch 'szzh' into dev_hjq
10 years ago
huang f731af0134 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 9b98bdcf5c 1、消息看过则不提示(方法实现)
10 years ago
huang ed8c4ac906 不同类型消息发送
10 years ago
huang 2cb5292dc1 完成课程讨论区消息回复方法
10 years ago
huang 4013ff486a 消息界面调整
10 years ago
huang 17fad1f291 课程(所有消息)--发布作业、新闻、问卷界面
10 years ago
huang 7ea0fac774 1。发布作业消息提醒
10 years ago
sw 50fa03d00c 发布问卷时,该问卷才显示在动态,取消发布后取消显示该动态
10 years ago
huang a5c941f48c 课程发布通知消息提示
10 years ago
huang b958340ab6 Merge branch 'szzh' into dev_hjq
10 years ago
huang 0917030395 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang c903325352 缺陷状态更新消息提醒
10 years ago
huang 69050b4271 指派给自己的缺陷不发送消息提示
10 years ago
huang 5dd2befe88 添加消息看过后即不显示功能
10 years ago
huang ee778b5968 1、增加issue消息提醒(发送给指派的人)
10 years ago
sw 2f77adfe9c 课程动态公共表的完成,去掉课程动态表的与我相关功能,动态的页面显示
10 years ago
sw 053587bd53 课程动态增加课程创建信息的动态
10 years ago
sw ce76308864 课程动态,历史数据的迁移
10 years ago
huang 998fe24e49 建立forge_messages表
10 years ago