Commit Graph

4592 Commits (48ac3dbea8eb14c6dec361e541a35339b6414b80)

Author SHA1 Message Date
alan e34e87bb82 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 2f168dd4d7 修改《课程动态》样式
10 years ago
lizanle 999b395763 添加Kaminari分页样式文件,
10 years ago
lizanle a47cb8eb65 去掉原有的样式分页样式
10 years ago
z9hang d8571ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang 6bd202e80a 课程作业列表当当前用户为课程学生时,输出分配给改学生匿评的作业集合
10 years ago
sw 269f1835b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 34c68a59fc 关闭问卷之后老师容许查看统计结果
10 years ago
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
10 years ago
alan 661dbe5219 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan a467736a5e 修改《多字段唯一性判断》
10 years ago
huang 666ebf9b5b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 9e470fa25c meigia
10 years ago
sw 0d6261dfa7 Merge branch 'dev_zanle' into szzh
10 years ago
sw 31c78279ea 删除多余的一个end
10 years ago
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 36c07f9664 修改拒绝项目成员加入后,页面不会刷新的BUG
10 years ago
huang d0a675f2b8 企业版模块
10 years ago
lizanle 22dd4981c0 修改分页函数
10 years ago
lizanle b453d16228 将controller里的两个方法挪到helper
10 years ago
lizanle 90649209ca 封装,简化,重新编排代码格式,并删掉了一些无用的方法代码
10 years ago
lizanle abc5dd1c74 添加表格样式
10 years ago
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西
10 years ago
lizanle e761cd5f22 关键字查询会丢失样式
10 years ago
sw 87fdd840ec 首页加入项目增加已是当前项目的判断
10 years ago
lizanle 852bb940a2 过滤掉日志中日志分析的请求
10 years ago
sw a265556cfe 搜索项目时增加js验证增加
10 years ago
sw 0d5384c6d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 97ec208b1a Merge branch 'dev_zanle' into szzh
10 years ago
whimlex deadea81fa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度
10 years ago
whimlex f05e046751 首页国际化
10 years ago
sw 6bca666f08 #1896 课程--问卷调查--新建题目时点击确定按钮无反应
10 years ago
sw c56f641163 修改首页加入项目按钮没反应
10 years ago
sw ce526fde77 Merge branch 'dev_zanle' into szzh
10 years ago
sw 2978d9020f Merge branch 'develop' into szzh
10 years ago
sw c366cc90e7 修改删除问卷后相关BUG
10 years ago
sw a772ef329d 修改问卷时增加问卷标题不能为空的提示
10 years ago
sw 108435f933 新增题目时,增加标题不能为空的js验证
10 years ago
sw b71d714103 #1887 用户职称显示问题
10 years ago
sw bf75f32903 修改个人留言界面,左侧个人信息样式显示不正确
10 years ago
sw af7e605f76 添加新闻时,“提交”按钮和“取消”按钮之间有一竖
10 years ago
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性,实现页面刷新跳转,意见反馈栏收拉一致
10 years ago
z9hang a6488da7fa 修改API上线问题
10 years ago
z9hang f7dbb24d35 修改测试版上线问题
10 years ago
z9hang 222e2cc135 修改ErrorHandler未能加载问题
10 years ago
z9hang f793cff398 改为开发模式下才调用api文档
10 years ago
z9hang 91a8078cae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
z9hang cf1cd9201c 修改上传资源弹框样式
10 years ago
alan 20f4b5c44b 修改《contest新建的样式》
10 years ago
alan 5434a5b087 修改《admin可以访问courses和users列表》
10 years ago
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 00c0ddc600 admin查看course和user列表
10 years ago
sw 950d831108 Merge branch 'api' into szzh
10 years ago
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle d8b5252279 调整了注释
10 years ago
lizanle 5afbf6dbca 调整了注释
10 years ago
sw 5950f0404b #1832 不显示无数据的字段,字段名
10 years ago
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 649c65fbe2 国际化部分代码
10 years ago
sw fe06ca503a 增加poll colsed_at的赋值
10 years ago
sw 97c7ccac16 增加关闭问卷功能
10 years ago
z9hang 4b3621905e 修正课程成员搜索bug
10 years ago
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex e5e24c1163 resolve conflict
10 years ago
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”,sidebar栏“缺陷”修改为“问题”;项目新建新闻按钮样式统一;新建课程样式统一;课程重开和关闭国际化;竞赛导航锁定;翻译缺失修正
10 years ago
alan 36ec204f40 修改《公共贴吧中,回复了帖子后,重新编辑的话能编辑标题》
10 years ago
alan f1495686e9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 0944cc4ca8 < 邮件格式调整>
10 years ago
sw d135274281 修改重复加入项目提示语
10 years ago
sw 87f19f7a8b #1873 加入”==》“申请加入”
10 years ago
sw 2f8d57797c 增加弹出框的宽度
10 years ago
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
sw 02f01c1aba 修改首页加入项目
10 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
10 years ago
z9hang b2396df68c 优化下代码
10 years ago
alan 7ef6f8adfb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan a3cf79db96 修改编码问题
10 years ago
sw 5e4279e158 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 2450bb777d 修改问卷统计界面样式
10 years ago
whimlex 14685f2656 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 38157e560e 课程--资源库--上传资源:当变化屏幕分辨率时,“上传文件”字样显示异常;添加用户或组没有链接;新建课程中,平台按钮样式调整成统一风格;课程主页,竞赛
10 years ago
alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 61634585f5 修改《news,forum模块发送邮件的模板》
10 years ago
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
10 years ago
sw dbdae2ac7e 问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
10 years ago
sw 016f4f9a0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 6645648027 学生是否看到问卷结果老师可配置增加数据库
10 years ago
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle
10 years ago
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
alan b20204fedd 修改《邮件重发一样引发的bug》
10 years ago
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
10 years ago
z9hang 4a672416e3 匿评作品详情接口添加评论的回复输出
10 years ago
lizanle df88cb6eba 管理员才能查看
10 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw bb64dc9452 修改问卷调查按钮的样式
10 years ago
alan 942035f698 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com>
10 years ago
sw 89ee38481b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 27fde6c641 添加注释
10 years ago
huang c65bab8c38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 03ae5fdeac 添加注释
10 years ago
huang c6deffe245 修改首页样式显示异常
10 years ago
sw ae31d0b861 #1851课程作业增加状态显示
10 years ago
sw 249b08392d #1856 修改问卷列表页面,发布问卷、取消发布后弹出界面显示不正确
10 years ago
sw 81f5a5e624 #1854学生点击查看已提交过的问卷时,多行主观题中显示有html元素
10 years ago
sw 2b5928602e 1.修改由于意见悬浮框引起的界面的padding不正确的问题
10 years ago
whimlex e950208e38 sina邮箱IE样式
10 years ago
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 1e36ca504a 多种邮箱邮件样式调整,回复内容样式更改
10 years ago
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 4fe8b23069 去掉不必要的代码,修改注释,格式
10 years ago
huang 388ddac96b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 84bfd30fc5 修改问题反馈弹框!
10 years ago
alan 8f1249390a 修改《发送多封相同邮件》
10 years ago
z9hang f1693e237b 修改匿评作品详情接口,输出匿评作品详情的同时还输出对该作品的评论(包括,教师评分,匿评及留言)
10 years ago
lizanle 8b6750c1ed 删除日志修改为只能修改当天的日志:这样子保护原来的日志,又能进行当天的调试
10 years ago
sw 90a81ee1f1 增加网站项目首页加入项目的功能
10 years ago
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 432e3a05f2 增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
10 years ago
sw 683625066e 修改进入未批列表修改排序后,老师进行评分之后排序会回到默认排序额问题
10 years ago
sw e72ed1054e 修改问卷调查按钮的样式
10 years ago
z9hang a4d7e5f932 匿评作品详情显示接口
10 years ago
whimlex 0c0160ac2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
whimlex 3279928bef 邮件样式调整,国际化;用户资料页面调整
10 years ago
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能
10 years ago
lizanle c0b12ac60c 去掉冗余代码
10 years ago
lizanle 7fc2ea0484 修改国际化文件名字
10 years ago
lizanle 566f59c49e 修改只有管理员才能查看
10 years ago
lizanle 0502eb16a6 添加了访问统计页面和耗时分析页面
10 years ago
lizanle 59a47002ae 重构,修正了许多的空指针异常
10 years ago
lizanle 061e4599c3 重构,修正了许多的空指针异常
10 years ago
lizanle c668b72dac 重构
10 years ago
sw d68486669e #1830课程--标签字体压线
10 years ago
z9hang b6207c0a47 关闭匿评
10 years ago
z9hang 89e0f98034 启动匿评接口
10 years ago
sw 520e9c73aa #1836 未登录或者没有权限访问私有项目时,跳转到403页面
10 years ago
alan f01d164295 Signed-off-by: alan <547533434@qq.com>
10 years ago
sw 0b2fa35a42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 77b8bf18c8 #1842 修改部分页面描述问题
10 years ago
sw a53831a6b5 修改当问卷标题过长时,学生查看问卷列表省略号过早出现
10 years ago
alan 64c0fc7413 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 6ccb154cc3 课程留言,发邮件给课程所有人
10 years ago
z9hang b13f2b2dc8 添加我的作品列表接口
10 years ago
sw 95dcdd7125 修改进入问卷编辑界面报错
10 years ago
sw 3bdaeb20c2 1、修改问卷列表页面样式
10 years ago
sw 402dfc788f 修改新建问卷时问卷名称默认为空
10 years ago
sw 4caf6ab5f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw f3062da237 修改空数据时,课程首页无法加载(居然是死循环。。。)
10 years ago
z9hang b949f70c64 修改数据格式转换方法
10 years ago
sw 77cb2b0893 1.修改学生已完成的问卷标题过长时显示异常
10 years ago
alan 9f36469d39 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能
10 years ago
z9hang 0a33a716de 添加课程作业列表API接口
10 years ago
sw 7b9d88ecfe 问卷调查增加重新发布功能
10 years ago
sw e493ae22cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 14a1f31a12 1、项目动态 -> 近期动态
10 years ago
lizanle 4796524a97 去掉项目动态查询中过大的时间跨度
10 years ago
z9hang abcf06ccc7 课程资源不能引用问题。原因:15年1-3月能属于2014年秋季学期,代码却将其判断为15年秋季学期了
10 years ago
alan 3315116832 修改《课程--留言:给课程留言却返回404》bug
10 years ago
lizanle 49ff5659d9 系统日志查看相关代码,资源
10 years ago
lizanle 2431fea63e 日志查看Helper
10 years ago
alan d5100e4808 修改《若用户没有填写姓名或者学号,在列表处姓名学号显示不合理》bug
10 years ago
alan 0b0b6c9b6e 修改《托管平台中点击某项目进入该项目主页,右上角的搜索处不输入内容点击搜索按钮,给出的提示信息显示不合理》
10 years ago
alan 0ed39fbcc7 修改《缺陷 Trustie-Forge#1793 (已解决): 登录平台后点击修修改资料,当身份为老师或者学生时:点击选择学校弹出框靠左压线显示,建议剧中现》
10 years ago
alan 092265d53c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
10 years ago
sw 00633c8331 1
10 years ago
sw 750c8d77aa 11111
10 years ago
sw 1e8c6374d7 Merge branch 'szzh' into Poll
10 years ago
sw 2a8a8ab3f2 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
sw 2f9e658697 增加问卷调查按钮的样式
10 years ago
huang 98b44d4903 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
huang e8cca08f40 多选查询去重,修改样式
10 years ago
sw 989ff4fcbe 修改弹出框高度
10 years ago
sw ebbe2f97d8 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
sw 2c6e53b935 修改弹出框宽度
10 years ago
sw 155d48b7cb 问卷列表每页显示20个
10 years ago
alan ebf63b9ba2 Signed-off-by: alan <547533434@qq.com>
10 years ago
alan ade0720331 邮件系统界面重置
10 years ago
z9hang 26b3aab6a2 增加题型显示
10 years ago
sw 8a05e032af 修改题型显示的样式
10 years ago
huang e5da3c47ed Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
huang 6bba6b2b76 weiwan
10 years ago
sw c43c6a8c3f Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
sw 8e017425cf 增加弹出框的样式
10 years ago
z9hang d9772ff2d0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
z9hang 05b1b9741b 问卷调查页面修改为每页显示5题
10 years ago
sw 629c4aaaa1 1、#1814 未发布的问卷显示在学生的问卷总数中
10 years ago
huang 7c100342f4 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
huang 6e698d45bb 修改了html边界超出问题
10 years ago
sw abd5996719 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago
sw b3f37f5154 111
10 years ago
sw bba213dec9 1.#1802 修复页面下方有很大一片空白
10 years ago
z9hang 33fd43e7b6 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
10 years ago