Commit Graph

828 Commits (584944059ade72ad0d4cadd38958410e6bcbf5e8)

Author SHA1 Message Date
chenmin 027bd1ace6 修复参加竞赛页面显示错误
11 years ago
chenmin e12a540061 项目日历页面描述错误修改;
11 years ago
sw 0c597d23a2 Merge branch 'szzh' into develop
11 years ago
sw f7635370d7 优化课程首页效率
11 years ago
sw ea0b7ef3f1 Merge branch 'szzh' into develop
11 years ago
linhk 0028c11426 退出项目功能
11 years ago
linhk 70a1839e74 英文界面-用户下拉菜单(我的课程、项目、编辑资料)显示问题
11 years ago
zhanghaitao d9a9867f96 #815 中英文显示问题修改
11 years ago
sw 7179943f8b Merge branch 'szzh' into develop
11 years ago
sw 78343effaf em.yml还原
11 years ago
sw 08821b9391 Merge branch 'szzh' into develop
11 years ago
linhk b545c5034d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw b0b3f257a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhanghaitao 45cc3ddb9b #873提示信息修改
11 years ago
linhk f173db4c9d 英文版用户注册页面身份下拉框显示错误的Bug
11 years ago
sw 37e5bdee22 修复某些课程动态内容为空的BUG #1128
11 years ago
sw 5f3ab0322b 修改竞赛上传图片提示 #1127
11 years ago
sw 94f6e871b1 修改新建用户时企业名不是英文且提示错误的BUG #1130
11 years ago
sw 9cb026ed39 增加竞赛删除评论的功能
11 years ago
sw d66dc65cca Merge branch 'szzh' into develop
11 years ago
sw a3cbcdad51 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw f0cee20f11 tt
11 years ago
sw 41d983e904 取消过期缺陷邮件的发送(很有问题)!!!
11 years ago
sw 31e8ad98ae 1.修复竞赛作品每次修改之后,都会吧图片清空的BUG
11 years ago
z9hang 03b212e363 首页定制,是否显示课程,竞赛
11 years ago
sw 01ea6238a4 修复竞赛通知描述过长时报错的BUG
11 years ago
sw b05e112a3f 1.修改邮件服务器配置
11 years ago
sw 3119d9a9aa 增加竞赛作品的搜索功能
11 years ago
sw c1bbd8a535 对于设置了完成日期的缺陷,到日期还没解决,给相关人员发一个通知邮件
11 years ago
nwb d6876fabc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 1156387161 “文件密级”改为“是否公开”
11 years ago
sw e344f16f5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 2141fcc3ca 将是否启用DTS测试移入项目模块配置
11 years ago
nwb 9da116c0e3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb cb4efd914e 修正项目文档删除BUG
11 years ago
sw a39672dd14 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 18ddb8604b 取消参赛作品名称、描述的字数限制
11 years ago
z9hang 1daec14ab5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 8871652e01 添加首页定制,设置是否显示"我的课程"功能
11 years ago
nwb 9c9778d433 项目的“资料下载”改为“作品下载”
11 years ago
nwb f052d0d461 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
z9hang 97531960da 首页定制添加剂修改图片大小功能
11 years ago
nwb 1257e67380 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 2bfc7aa93f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw 70003c8374 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 6d5f72326f 增加定时任务
11 years ago
z9hang 7eb1a76734 修改编辑贴吧无导航栏、提交失败无提示bug
11 years ago
z9hang 4542b9e21a 积分修改
11 years ago
z9hang 80b5871756 竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
11 years ago
z9hang 0b6168c7fd 添加竞赛首页发布通知通告相关代码
11 years ago
nwb 68be9c25b8 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw ab55043880 修复当作业附件列表为空时,点击打包下载会报500错的BUG
11 years ago
nwb 79eac39dc2 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 222959d1da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 27fda1f938 竞赛首页修改
11 years ago
yanxd 472b61fefe 删除了不能通过的测试,修改user_activities。所有原路由测试可以通过。
11 years ago
nwb 5adac1a32a 课程讨论区回复内容为空时提示
11 years ago
nwb b655f0c7b0 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 29618d6a72 竞赛界面调整
11 years ago
nwb b7c4f87a8f Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 02b4029e8c 资源文件下载界面调整
11 years ago
z9hang d9e04bab0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题
11 years ago
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6a45a0287d 添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
11 years ago
sw b142953a4b 1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
11 years ago
yanxd 37d0560b70 test test
11 years ago
z9hang cf339edb6c 添加首页定制的非空验证,长度验证
11 years ago
nwb 0950ac2329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 87b623bc51 1.文档添加密级设置
11 years ago
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3dfcc90574 课程、竞赛首页定制
11 years ago
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
11 years ago
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
11 years ago
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
11 years ago
z9hang b4dd8409eb 添加项目托管平台首页定制功能
11 years ago
yanxd 803e9cbdb5 globel issue#858, 中国高校--输入无效条件点击搜索,建议给出提示信息
11 years ago
z9hang 720c75478a 修正上传图片可传非图片文件bug
11 years ago
sw 41823fbddf test
11 years ago
z9hang 9634046d11 权限管理机制优化
11 years ago
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq
11 years ago
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb ae32b310cd 新建竞赛时的日期信息提醒变更
11 years ago
z9hang 470f40db82 去除绝对网址
11 years ago
nwb 3a7065bb2d Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
sw 3e185c3a4b 修改学校链接
11 years ago
sw b42d742c06 1.增加我的学校链接
11 years ago
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb ae8093c400 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 2a6cbe28f0 修正课程首页错误
11 years ago
sw 3c7e680b1b Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 41999e64b7 Merge remote-tracking branch 'remotes/origin/szzh' into develop
11 years ago
nwb 31e338f1e5 修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
11 years ago
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd f664ec10b4 Merge branch 'szzh' into develop
11 years ago
z9hang fe3861c1d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 54a2fb8a9c 主页项目得分与项目页面的项目得分保持一致
11 years ago
nwb 2b855badf9 修正课程资源库关联已有资源功能
11 years ago
sw 063460f119 tt
11 years ago
sw 4470f0dd73 添加作业时增加教师评分所占比例设置
11 years ago
linchun 79f68c2231 Merge branch 'szzh' into develop
11 years ago
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG
11 years ago
nwb a115edea9d 修改课程标签页选中状态
11 years ago
nwb b4af75f289 部分界面优化
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
z9hang 773b728828 修改:自己不能踩或顶自己
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
nwb 8a5e1f5d9f 界面修改
11 years ago
nwb 936c40b490 提交作业逻辑和视图修改
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
senluo cc39172d87 fix
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
nwb 9c3605320e 加入、退出课程逻辑优化
11 years ago
yanxd 3fd7104448 welcome index obj.includes, routes add school logo
11 years ago
yanxd 93d13c8867 system bin, 坑
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd 362570e34b contestnotification_edit function
11 years ago
yanxd 0536af6625 Merge branch 'szzh' into develop
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
nwb 165dbc3f78 修改words_controller与课程相关方法及视图
11 years ago
wanglinchun d76eec27cc 为竞赛通知评论添加登录权限
11 years ago
nwb 70901832a8 1.修改课程讨论区control index、show方法及路由
11 years ago
nwb d6280befca 修改新闻model、路由、index方法
11 years ago
sw d0dd6eb781 1.修改作业时实现作业添加参与人员与删除参与人员
11 years ago
sw 130f9f87c2 1.实现作业添加成员的翻页功能
11 years ago
wanglinchun a40db3dc4b 首页添加了竞赛所获奖项显示
11 years ago
nwb f741b0581c 修改课程资源文件视图BUG
11 years ago
sw 26b933dddb t
11 years ago
nwb 2f3d9b1795 1.修改资源文件类index方法
11 years ago
wanglinchun 1393aebace 完成了按钮样式
11 years ago
yanxd 4c7bcd50f5 contests delete routes error
11 years ago
yanxd c3865ab319 notificationcomments
11 years ago
wanglinchun 45e12c4bef xx
11 years ago
wanglinchun 372de9932a 英文版竞赛子站完成
11 years ago
wanglinchun 42aba52111 竞赛子站英文版5
11 years ago
z9hang 4478c86cea 添加课程 查看真名、查看成员、作业导出权限代码(未应用)
11 years ago
sw 8f94985186 1.添加作业时权限判断
11 years ago
wanglinchun c31c5d49d1 竞赛子站英文版4
11 years ago
wanglinchun 6546d107c8 英文版3
11 years ago
wanglinchun b1b7c19e58 英文版实施2
11 years ago
wanglinchun 0e09137b99 竞赛子站英文版实施中
11 years ago
z9hang 09368442c6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 040e469cb2 竞赛子站国际化
11 years ago
z9hang d83899e3e4 添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码(未应用)
11 years ago
wanglinchun 928d61a3cd 国际化竞赛子站
11 years ago
wanglinchun bbf7aca174 完成了英文版参赛作品页面
11 years ago
wanglinchun 56ca98ab18 完成英文版竞赛列表页面
11 years ago
wanglinchun 8a2e57d675 竞赛列表英文页面完成
11 years ago
nwb c1f9f389b7 修改课程讨论区视图,从项目中分离
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
sw 81a97f6a5e 1.老师创建作业增加功能:是否启用互评,以及该功能的修改。对不启用互评的作业,学生不可下载作业,不可互相打分,但可以留言;老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
11 years ago
wanglinchun d06488c10d 为竞赛通知添加评论
11 years ago
wanglinchun ed84ec633f 竞赛通知
11 years ago
wanglinchun ae70081288 eter
11 years ago
z9hang ae5ced6a51 课程权限添加(部分)
11 years ago
nwb a49cf3eb6b 1.修改课程作业路由
11 years ago
nwb 0d99644fa7 1.用户课程表逻辑修改
11 years ago
sw 78ac974a75 1.修改课程作业列表界面提交作业
11 years ago
nwb 4404222437 0604
11 years ago
sw 94542e935a 增加点击作业名下载改作业下所有附件的功能
11 years ago
wanglinchun da26c70f6c 修改首页子站入口
11 years ago
wanglinchun a38ffb9e9d 首页修改4
11 years ago
wanglinchun 7abeabeadf 首页修改3
11 years ago
wanglinchun 4b54f2949d 首页修改2
11 years ago
wanglinchun e5a76251a5 修改首页2
11 years ago
wanglinchun ebcdd2cc9e 修改首页英文显示
11 years ago
wanglinchun b5be2d58ce 英文子站首页
11 years ago
sw 50171ad0f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
wanglinchun 6a8d697582 Merge branch 'develop' into competition
11 years ago
wanglinchun a3fb48a4bb 0603
11 years ago
sw 9bfe9ba1b2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
11 years ago
sw 1a0de23b38 修改作业在进行修改、删除、添加时的代码
11 years ago
wanglinchun 81a45fe977 dfs
11 years ago
nwb e490f7979d 添加课程index界面
11 years ago
wanglinchun bf71a38608 竞赛通知相关文件修改
11 years ago
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
xianbo 7d1327ad2a Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 9e05ecf5b4 修改主页展示部分
11 years ago
wanglinchun 43449e66b5 增加了竞赛通知按钮
11 years ago
nwb f936c30ec9 添加与course.index相关的control、view、help等实现
11 years ago
nwb 4e815a38b6 更改路由,课程独立出来,不再包含在项目中
11 years ago
sw 03c8f39729 1.修复登录提示描述不正确的问题
11 years ago
z9hang 2e36949604 添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
11 years ago
z9hang 2d77975221 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw e0273d320c 1.登录增加js提示可以用昵称和邮箱登录
11 years ago
nwb b52690adc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 61135a352a 上传文件表单支持添加文件标签
11 years ago
z9hang daecf1a53b 老师收到课程留言区的直接留言及对老师的回复的邮件提醒
11 years ago
z9hang bf12692de4 登录名==》账号/邮箱
11 years ago
xianbo 0f56d9e885 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang fdf8b5640a 添加显示bug的页面
11 years ago
yanxd 98444ef01e remove fuzzy routes|add school missing row
11 years ago