Commit Graph

928 Commits (6a6ed841ad6f60a89a7b5b77dc42ef2ab4d8f105)

Author SHA1 Message Date
z9hang f0bc0b2e93 项目关注、取消关注、申请加入、取消申请加入返回js修改
11 years ago
huang fd9eaa93d6 关注添加+号;去掉css文件中多余符号引起的样式问题
11 years ago
huang cea43cb045 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 69eb7fbd77 关注、加入项目样式,处理样式冲突
11 years ago
sw b6b479f6f9 1、增加开启关闭匿评时弹框
11 years ago
sw 69d1fdb699 111111111111111
11 years ago
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev
11 years ago
dingxu 79588489e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
dingxu 440855c0e6 修改项目tag样式
11 years ago
z9hang 2a3a70b7d5 app接口部分信息国际化
11 years ago
huang 1cdf397bc0 修改关注、申请方法中样式
11 years ago
sw d92ac2d909 1、课程跳到其他页面后没有分块
11 years ago
sw 423849ca84 加入课程、退出课程、配置、关闭、复制等按钮
11 years ago
sw 1c30b8c81c 1、增加获取某个课程动态数的方法
11 years ago
sw 8f5d8c86a3 新版样式header调整
11 years ago
sw 64b0646281 base_course基本完成
11 years ago
sw e4c0c840bf 1、完成课程模块导航栏样式调整
11 years ago
whimlex e8da6ef871 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 50fe8f2bb7 项目配置模块
11 years ago
lizanle 86020804c9 ok
11 years ago
lizanle 33669017bf controller
11 years ago
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
lizanle 5c4a62dcc4 DiscussDemo代码
11 years ago
guange bcb162c600 #1968 解决IE8不能上传的问题, 只是解决,体验还是没有chrome,firefox的好
11 years ago
sw d18e9ff66b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 2ee04d55f2 修改项目邀请用户的界面
11 years ago
z9hang 7e7da7e445 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang a05061af73 #1859 课程--资源库:全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
11 years ago
sw b27bb34662 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 57c8575470 新版项目模块国际化,目前完成各项目主页,项目动态,项目评分
11 years ago
sw 4b831c9e65 #2001 项目--工具集中wiki-“查看差别”中有html标签
11 years ago
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 115eb38a02 完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签
11 years ago
huang ce792f6ce8 修改邮件发送界面
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
huang beac15475d 新项目及用户反馈框的修改!!
11 years ago
sw 5692cbf202 #1965 公共贴吧取消软件创客入口
11 years ago
sw 26081c6120 新建项目时增加不选择所属组织
11 years ago
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh
11 years ago
sw dead08a0d6 添加、修改项目增加所属组织的选择
11 years ago
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存
11 years ago
sw 73d2e2e5e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex 59a2c8283a 国际化结构调整
11 years ago
sw 2ceb21b83b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d913f89a82 添加课程动态接口
11 years ago
sw 859889b750 简化查询匿评数量的代码
11 years ago
sw 4cdb3c83dd 增加获取用户在指定课程内作业数量的接口
11 years ago
huang 523af8b2a9 修改企业版结构及列表页面
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 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang d0a675f2b8 企业版模块
11 years ago
lizanle b453d16228 将controller里的两个方法挪到helper
11 years ago
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西
11 years ago
lizanle e761cd5f22 关键字查询会丢失样式
11 years ago
lizanle 852bb940a2 过滤掉日志中日志分析的请求
11 years ago
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
whimlex f05e046751 首页国际化
11 years ago
sw ce526fde77 Merge branch 'dev_zanle' into szzh
11 years ago
sw b71d714103 #1887 用户职称显示问题
11 years ago
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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 fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle d8b5252279 调整了注释
11 years ago
sw 5950f0404b #1832 不显示无数据的字段,字段名
11 years ago
sw 649c65fbe2 国际化部分代码
11 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
11 years ago
whimlex 38157e560e 课程--资源库--上传资源:当变化屏幕分辨率时,“上传文件”字样显示异常;添加用户或组没有链接;新建课程中,平台按钮样式调整成统一风格;课程主页,竞赛
11 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle 27fde6c641 添加注释
11 years ago
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f1693e237b 修改匿评作品详情接口,输出匿评作品详情的同时还输出对该作品的评论(包括,教师评分,匿评及留言)
11 years ago
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能
11 years ago
lizanle 59a47002ae 重构,修正了许多的空指针异常
11 years ago
z9hang 89e0f98034 启动匿评接口
11 years ago
alan f01d164295 Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 6ccb154cc3 课程留言,发邮件给课程所有人
11 years ago
z9hang b949f70c64 修改数据格式转换方法
11 years ago
z9hang abcf06ccc7 课程资源不能引用问题。原因:15年1-3月能属于2014年秋季学期,代码却将其判断为15年秋季学期了
11 years ago
lizanle 2431fea63e 日志查看Helper
11 years ago
sw 1e8c6374d7 Merge branch 'szzh' into Poll
11 years ago
huang e8cca08f40 多选查询去重,修改样式
11 years ago
huang 6bba6b2b76 weiwan
11 years ago
huang 6e698d45bb 修改了html边界超出问题
11 years ago
huang 0f5c3c5f4c 添加主观题统计页面及样式
11 years ago
huang 3acec4b7c1 修改了总统计数
11 years ago
huang 59c21d81e9 修改了分母不能为0的bug
11 years ago
huang 7177303eeb 问卷统计最终效果
11 years ago
z9hang dc2c96f59a 提交后的问卷禁止查看与编辑
11 years ago
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
11 years ago
z9hang 77dc9607df 简答题答题
11 years ago
z9hang d684acf527 多选题答题功能
11 years ago
z9hang 6d82e79e7f 答题相关方法添加
11 years ago
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh
11 years ago
z9hang 0f9915fc2a Merge branch 'szzh' into api
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
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 575b641e25 merge dev_chuangbin
11 years ago
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire!
11 years ago
alan 9bbc8d64eb 课程母版页加载缓慢
11 years ago
alan 2262997c31 修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
11 years ago
alan b17d4840b1 《作业优化》
11 years ago
alan 0e7f7a4254 优化《作业评分》
11 years ago
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 2a94c61a3e 修改bug(项目--缺陷:更新图片时在历史记录中没有相关记录,删除图片只显示一个更新时间也不合理)
11 years ago
sw f834759d84 #1709测试版--课程--加入课程:成功加入课程,还是显示为“加入”,需手动刷新页面
11 years ago
alan 683acfcafc 优化《学生列表作业评分查询太慢》功能
11 years ago
alan 1965b75d92 添加《学生列表按作业评分排序》功能
11 years ago
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能
11 years ago
= bb23468c7d Merge branch 'szzh' into api
11 years ago
z9hang 36967eeec0 修改注册接口、添加作业列表接口
11 years ago
z9hang 9abe730dff 恢复私有课程的公开资源不能引用问题(导致搜索速度慢)
11 years ago
z9hang e4439daf3b 全站搜索bug
11 years ago
z9hang c0a0c41e14 私有课程的公开资源能下载bug
11 years ago
sw cf5b03a379 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d9250231e5 #1698 1.修改标签查询结果中点击课程/项目列表报错的BUG
11 years ago
alan 90a01c8d84 对新增功能《添加学生列表班内搜索和课内搜索》样式微调
11 years ago
alan d8a568e685 增加《分班搜索学生》功能
11 years ago
alan fbe6ce16d7 修改《分组界面》样式
11 years ago
sw d5de3dcb56 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw f2cfa6d4a1 修改课程老师、学生数量显示为实际数字,而不是+
11 years ago
alan 078639b35a Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
11 years ago
alan cfb8edbfe2 分组功能样式微调
11 years ago
sw a64cae5da3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 2b3edbc8fb #1663 课程资源库--全站搜索:老师不能引用其他资源至我的课程了
11 years ago
alan c9b84d0a35 增加《学生加入,退出分组》功能
11 years ago
alan 66f93150f6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
11 years ago
alan 9765f11f7e 增加<修改,添加分组>功能
11 years ago
sw 4bbc76a217 1.重写homework_attach的show方法,优化弹出框的弹出效率
11 years ago
z9hang 2a7e0365b8 注册修改
11 years ago
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
11 years ago
alan 615bc7d444 增加课程分组的功能
11 years ago
sw 19b61118ac 修改加入按钮失败后变为加入课程按钮
11 years ago
sw f934824175 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d9c3103e6e 1.修改留言列表得分显示样式
11 years ago
z9hang 29d4266c6c 引用次数的统计修改及按引用排序
11 years ago
alan 63c9804da8 添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
11 years ago
z9hang 298b767fc4 资源显示,对于课程外人员不在显示私有资源
11 years ago
z9hang 514dcb97a0 完成资源按时间、下载次数排序功能
11 years ago
z9hang c2d618ce9c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 71e7d2c872 修改全站搜索结果显示策略:私有资源属于当前课程,且当前用户为当前课程的成员时可见,其他情况私有资源不可见
11 years ago
sw cd3f4ef8d3 修改标签的显示js
11 years ago
sw 2b5160f2d9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 9898e1650b 1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
11 years ago
z9hang b0db7dfece 添加判断课程是否为当前学期或下一学期方法
11 years ago
z9hang f267a3daf8 引用课程中已有的资源时提示资源已存在
11 years ago
sw e68900b9a0 #1616 修改课程时开课日期选项错误
11 years ago
z9hang 8a3669ba3b 引用次数统计包括多级引用
11 years ago
z9hang 5a20945e0d 选入我得课程列表中添加课程学期的显示
11 years ago
sw 5bcc76d399 修改作业提交项目第一项为请选择
11 years ago
sw 23da0a6dad 修改作业提交项目时默认问空
11 years ago
z9hang feccad8fa5 用户为创建课程,或没有作为教师的课程时,不显示引入我的课程按钮
11 years ago
sw d788e46546 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 436cf1175f 修改课程资源模块相关问题
11 years ago
sw 06a513b2ee 修改不选择项目时的<<NULL>>为 NO PROJECT
11 years ago
z9hang 36e7b222bb 课程资源修改为公开的也需登录才能下载
11 years ago
moon 600afdc6e0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
moon e4e4c94d53 封掉所有列表入口,及页面中更多入口
11 years ago
z9hang 2348e063d1 调整选入课程弹框中列表的显示策略
11 years ago
sw f9b3cc6588 Merge branch 'szzh' into CouerseResources
11 years ago
sw 3215786538 修改非课程成员能看到提交作业按钮
11 years ago
z9hang f2da5704ef 课程应用的功能实现
11 years ago
sw 80e3e44f13 修复学生不能退出私有课程的BUG
11 years ago
sw 9d971069b5 Merge branch 'Homework' into szzh
11 years ago
sw e3d735ecfc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 9bd1af9541 #1480 项目留言区回复时间显示问题
11 years ago
alan 1468f4a8df 修改《修改资料》页面
11 years ago
sw 54aae26cbe 被除数为0时弹框报错
11 years ago
sw b8c9651079 111
11 years ago
sw 14db93c10a 教师作业列表增加当前作业提交信息,匿评信息提示
11 years ago
sw 7d97889261 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
gonglexin c52e87c74f 统计数据
11 years ago
sw 6178919735 修改创建课程时当前学期的默认选择设置
11 years ago
sw e5874283f1 1.修改课程实践列表提交作业按钮链接
11 years ago
sw 2f8f8593eb Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
sw 13c362b08d 1.作业排序按钮显示顺序
11 years ago
z9hang fced7dcb91 进入自己的作业不让评分
11 years ago
z9hang c2fe1b7c72 修正评分不能点问题,作品留言
11 years ago
z9hang 2628ab4808 修改评分列表获取方式
11 years ago
z9hang 47c8ffd22a 作业修改
11 years ago
z9hang 96626eeb6b 恢复respond_path路由并修改部分respond_path
11 years ago
sw 8a7757f3c2 1.整理踩、赞页面代码
11 years ago
sw 58d32bcf2b Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
z9hang f5e9528b12 修改base_homework界面
11 years ago
sw e6fdda1702 修改未批、已批、全部作业、留言action的路由
11 years ago
gonglexin 811b6383f7 初次加载页面时给定一个默认排序
11 years ago
gonglexin b2f75d5826 给时间和分数排序增加顺序和倒序排序功能
11 years ago
gonglexin bb642d320d Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
gonglexin f3d8aebfe4 给排序设置正确的路径
11 years ago
sw fe65e3619c 点击评分增加弹出框
11 years ago
z9hang 7c331cf49c 还原对tags做的修改(上次的修改对一个系统文件做了修改,无法应用到本系统)
11 years ago