Commit Graph

1927 Commits (434415343c5602d1b1b32a414ed09be9ccff6b8d)

Author SHA1 Message Date
sw fea7bd6ad1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 945b9ff9cf 修复进入我的动态,关注人没有进行权限过滤的BUG
11 years ago
alan 6cf7e156d1 Signed-off-by: alan <547533434@qq.com>
11 years ago
sw 3e3cde0805 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ff2b4c610c 1、修改用户动态每页显示条目不正确
11 years ago
alan 5ff43fdea7 项目添加新用户邮件发送功能
11 years ago
huang ce792f6ce8 修改邮件发送界面
11 years ago
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 754acc6945 移动端版本管理
11 years ago
huang b2b978d540 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw a6b3ddcfcb Merge branch 'szzh' into dev_zanle
11 years ago
huang beac15475d 新项目及用户反馈框的修改!!
11 years ago
lizanle 10faab0129 新建的项目发布新问题报500
11 years ago
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
11 years ago
sw d947a914cc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw e2307366f6 实现组织的增、删、改、查功能及相关界面
11 years ago
z9hang 3334299808 app版本管理功能(表添加,页面部分添加)
11 years ago
lizanle 8d322edb90 Merge branch 'szzh' into dev_zanle
11 years ago
sw 3c4b502e97 1、修改进入组织主页项目列表显示不正确的问题
11 years ago
sw 5f8595d874 admin页面增加组织列表
11 years ago
sw 3b4bf8b99d 增加组织的index界面,以及index界面到组织首页的跳转
11 years ago
sw dead08a0d6 添加、修改项目增加所属组织的选择
11 years ago
sw d1edd86e11 1、修改组织首页项目获取
11 years ago
z9hang 04dea372c5 添加意见反馈接口
11 years ago
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存
11 years ago
sw 2c4e864080 #1949 学生可以通过url访问老师并未发布的问卷并进行作答
11 years ago
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
11 years ago
sw bbeaa6e80c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 22ac578ede Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan f374bfd7e2 修复《窗口跳转问题》
11 years ago
sw d999a9f4a6 修复新建课程时报错的BUG
11 years ago
z9hang 18271946d7 作业详情,课程作业列表接口返回数据格式修改(增加了作业作者相关信息)
11 years ago
alan aa8f58530c 给黄总提供接口
11 years ago
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
11 years ago
sw f380d781e7 增加根据已有课程复制成新课程的路由以及方法实现
11 years ago
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
11 years ago
alan 6f9e2bad63 mail weekly
11 years ago
huang 59e7f2f28b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 8bef9420cf 修改企业版中自己能看到自己的私有项目
11 years ago
sw 6226974f0b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 56fa330fed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 26b1f9f433 修改企业版中存在的一些bug
11 years ago
sw 320ee9289a #1897 修改点击DTS测试之后,TAB页背景色变化
11 years ago
alan 646678c9db 修改《课程--学生列表:输入有效条件获得搜索结果,对搜索结果按积分排序,却自动返回对所有学生排序》bug
11 years ago
z9hang 836be8c75e 添加企业首页配置功能
11 years ago
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 523af8b2a9 修改企业版结构及列表页面
11 years ago
sw 8289ca6c89 11111
11 years ago
huang 768e06ea8a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang be9ff9b4bb 修改控制器名
11 years ago
z9hang d8571ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6bd202e80a 课程作业列表当当前用户为课程学生时,输出分配给改学生匿评的作业集合
11 years ago
sw 0d6261dfa7 Merge branch 'dev_zanle' into szzh
11 years ago
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang d0a675f2b8 企业版模块
11 years ago
lizanle 90649209ca 封装,简化,重新编排代码格式,并删掉了一些无用的方法代码
11 years ago
sw 87fdd840ec 首页加入项目增加已是当前项目的判断
11 years ago
sw 97ec208b1a Merge branch 'dev_zanle' into szzh
11 years ago
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度
11 years ago
sw c56f641163 修改首页加入项目按钮没反应
11 years ago
sw ce526fde77 Merge branch 'dev_zanle' into szzh
11 years ago
sw c366cc90e7 修改删除问卷后相关BUG
11 years ago
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
11 years ago
alan 5434a5b087 修改《admin可以访问courses和users列表》
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
sw 950d831108 Merge branch 'api' into szzh
11 years ago
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 5afbf6dbca 调整了注释
11 years ago
sw fe06ca503a 增加poll colsed_at的赋值
11 years ago
sw 97c7ccac16 增加关闭问卷功能
11 years ago
z9hang 4b3621905e 修正课程成员搜索bug
11 years ago
sw d135274281 修改重复加入项目提示语
11 years ago
sw 02f01c1aba 修改首页加入项目
11 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
11 years ago
sw dbdae2ac7e 问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
11 years ago
sw 016f4f9a0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库
11 years ago
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle
11 years ago
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
11 years ago
lizanle df88cb6eba 管理员才能查看
11 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
11 years ago
alan 942035f698 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com>
11 years ago
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle 4fe8b23069 去掉不必要的代码,修改注释,格式
11 years ago
lizanle 8b6750c1ed 删除日志修改为只能修改当天的日志:这样子保护原来的日志,又能进行当天的调试
11 years ago
sw 90a81ee1f1 增加网站项目首页加入项目的功能
11 years ago
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 432e3a05f2 增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
11 years ago
sw 683625066e 修改进入未批列表修改排序后,老师进行评分之后排序会回到默认排序额问题
11 years ago
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能
11 years ago
lizanle 566f59c49e 修改只有管理员才能查看
11 years ago
lizanle 061e4599c3 重构,修正了许多的空指针异常
11 years ago
sw 520e9c73aa #1836 未登录或者没有权限访问私有项目时,跳转到403页面
11 years ago
sw 3bdaeb20c2 1、修改问卷列表页面样式
11 years ago
sw 402dfc788f 修改新建问卷时问卷名称默认为空
11 years ago
sw 4caf6ab5f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b949f70c64 修改数据格式转换方法
11 years ago
alan 9f36469d39 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能
11 years ago
sw 7b9d88ecfe 问卷调查增加重新发布功能
11 years ago
lizanle 4796524a97 去掉项目动态查询中过大的时间跨度
11 years ago
lizanle 49ff5659d9 系统日志查看相关代码,资源
11 years ago
sw 00633c8331 1
11 years ago
sw 750c8d77aa 11111
11 years ago
sw 1e8c6374d7 Merge branch 'szzh' into Poll
11 years ago
sw 155d48b7cb 问卷列表每页显示20个
11 years ago
alan ade0720331 邮件系统界面重置
11 years ago
sw c43c6a8c3f Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang 05b1b9741b 问卷调查页面修改为每页显示5题
11 years ago
sw 629c4aaaa1 1、#1814 未发布的问卷显示在学生的问卷总数中
11 years ago
alan b9ea3e589e 修改《邮件系统》页面
11 years ago
sw ae9856c01a 发布时弹出框js、css调整
11 years ago
sw 17b96bdb14 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw 79ad33a90f 增加发布问卷的路由
11 years ago
z9hang e49dfefefb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang dd42c89ee6 百分比除数为0问题
11 years ago
huang 2cbe801528 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
huang 7177303eeb 问卷统计最终效果
11 years ago
sw d448599664 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang b8047bec28 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang 0a367249ae 问卷完成度显示
11 years ago
sw 65a3ddce41 1、增加新增单行文字功能
11 years ago
huang b53686dfd7 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
huang eacc1079b0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw a683acf85c 修复新建问卷时刷新页面,会新建一个问卷的BUG
11 years ago
huang 34b8ffeb5b tongji
11 years ago
sw 40d6ebfd88 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw 9fb0275563 1.增加修改单选题时页面js的刷新
11 years ago
z9hang dc2c96f59a 提交后的问卷禁止查看与编辑
11 years ago
sw f41cd0a8ab 1.修改单选题业务逻辑处理
11 years ago
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
11 years ago
z9hang 30a058133d Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang e44cc07f86 提交问卷功能
11 years ago
sw c4bedfb369 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw d55492b07a 增加修改单选题的路由、action、以及js
11 years ago
z9hang 77dc9607df 简答题答题
11 years ago
sw 5ec2789881 删除某一题目后,后面的题目序号自动-1,以及页面js的刷新
11 years ago
sw 3fab26214f 删除单选题后页面数据的删除,增加删除题目的路由及相关方法
11 years ago
sw 870f9bba98 必答按钮的数据存入
11 years ago
sw a99d7c5145 1、分离出新建问卷问题页面
11 years ago
z9hang d684acf527 多选题答题功能
11 years ago
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更
11 years ago
z9hang d2fadfda08 单选题选择答案
11 years ago
z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang 6d82e79e7f 答题相关方法添加
11 years ago
huang 2b0775da26 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
huang b63b4974eb 统计
11 years ago
sw 2a23eb8e17 1.增加单选题的显示
11 years ago
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》
11 years ago
sw 0433f7c87f 增加新建单选题功能
11 years ago
sw 2af6121f82 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw eb2498c62c 1.增加新增单选题、新增选项、删除选项等js
11 years ago
z9hang b6826a74d3 问卷显示
11 years ago
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js
11 years ago
alan 2f147dcddd 增加《邮件地址自动登录功能》
11 years ago
sw fc72d6f9a9 1.增加问卷统计、问卷答卷等页面跳转,并增加对应路由
11 years ago
z9hang 0f9915fc2a Merge branch 'szzh' into api
11 years ago
sw a18fa10de5 1.增加老师和学生显示界面的区别
11 years ago
sw 32219bd850 增加访问权限控制
11 years ago
sw d0dc01b992 增加问卷修改功能,以及相关js
11 years ago
z9hang 525cf10376 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6efe9ff5c6 注释掉无用的方法调用
11 years ago
sw 475b046898 修改访问poll#index报ArgumentError
11 years ago
sw 1c24a306fe 去掉无用的control
11 years ago
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面
11 years ago
sw 9604117e93 Merge branch 'develop' into szzh
11 years ago
alan 9f807438d6 教师数目显示:-1 ,同时动态大量不显示。是不是只显示近期3个月的?
11 years ago
sw 90349eed5d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
sw 6fc496c8ee Merge branch 'szzh' into develop
11 years ago
alan 74af44a826 修改《修改个人资料页面》bug
11 years ago
sw bf7eaa7a80 修复同一个学生提交相同的文件后,打包下载异常的BUG
11 years ago
sw f101037b26 Merge branch 'szzh' into develop
11 years ago
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang f7c1b76b3d 用户反馈弹框模块!
11 years ago
z9hang 666facd483 Merge branch 'szzh' into develop
11 years ago
sw f4e30f77cc 1.打包下载异常捕获去除
11 years ago
alan 6c9f5136c0 修改《竞赛主页显示错误》
11 years ago
zhuhao 92cf3d86cc Merge branch 'develop' into szzh
11 years ago
sw 9ef3849fe3 如果缺少某一附件。在下载后的文件增加相关说明文档
11 years ago
sw 82c2a659df 修复当作业打包下载时,某一文件不存在时,跳过该文件继续下载其他的文件
11 years ago
alan 53b57d4c53 修改《个人主页积分弹框显示错误》bug
11 years ago
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构
11 years ago
alan 2262997c31 修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
11 years ago
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹
11 years ago
z9hang b711793d7c 修正加入课程接口问题
11 years ago
sw 2277d388c0 修改了两处语法错误
11 years ago
z9hang f252438f85 修改编辑课程接口
11 years ago
sw 805de7fc28 修改课程首页课程列表显示策略
11 years ago
alan c1705bd65b 增加《导入student_for_course数据》
11 years ago
sw fc7447ba6b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9fc7ed8233 修复老师第一次评分报错问题的BUG
11 years ago
alan 275d691b13 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan ba524675e0 修改<打分更新表单>bug
11 years ago
sw 77e8d412ea 修改评分列表中教师评分未最后一名教师的评分
11 years ago
sw 3dc7c55aef 去除评分时部分重复查询
11 years ago