 huang
|
72d41fd07a
|
修改邮件邀请提示信息！
|
10 years ago |
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
10 years ago |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
10 years ago |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
10 years ago |
 sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
|
whimlex
|
aee987d634
|
邀请Trustie用户
|
10 years ago |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
10 years ago |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
10 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
10 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
10 years ago |
|
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
10 years ago |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
10 years ago |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
10 years ago |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
10 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
10 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
10 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
10 years ago |
|
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
10 years ago |
|
huang
|
64bbbff879
|
添加里程碑
|
10 years ago |
 lizanle
|
8f3f9ea2ed
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a8a62ab750
|
issue2012,分页显示方式修改
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 years ago |
|
sw
|
138fac9509
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/homework_attach/_jour.html.erb
app/views/homework_attach/_journal_reply_items.html.erb
app/views/homework_attach/_showjour.html.erb
app/views/words/_feedback.html.erb
app/views/words/_journal_reply_items.html.erb
app/views/words/_message.html.erb
|
10 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
10 years ago |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
huang
|
0402fee6de
|
修改邮件邀请
|
10 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
10 years ago |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
10 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
10 years ago |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
749e10592d
|
修改邮件页面样式
|
10 years ago |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
10 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
10 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
10 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
10 years ago |
|
sw
|
7f249d29f4
|
修整页面代码
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
10 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
10 years ago |
|
lizanle
|
a47cb8eb65
|
去掉原有的样式分页样式
|
10 years ago |
|
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
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
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
10 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
10 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
10 years ago |
|
lizanle
|
22dd4981c0
|
修改分页函数
|
10 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
10 years ago |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
10 years ago |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
10 years ago |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
10 years ago |
|
alan
|
4b9bad0dc5
|
修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
11 years ago |
 z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
11 years ago |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
b141db6624
|
用户留言修复
|
11 years ago |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7d3a18197b
|
修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
21c6f01d5f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8cbc4eb938
|
#1318 课程/项目，点击打开该标签，不显示对应的课程/项目名称,原实现逻辑与现存的数据有冲突，扩展了其实现方式，使之兼容现有的数据
|
11 years ago |
|
sw
|
29e6158fa4
|
修改版本列表名称过长时显示为隐藏
|
11 years ago |
|
z9hang
|
efc247f2e7
|
1、各个页面在，没有数据情况下的显示调整。2、点击竞赛列表，在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
69dc22e218
|
#1247修复项目--配置--版本：新建版本，输入“wiki页面”为非汉字类型且字数较多时，显示异常的BUG
|
11 years ago |
|
sw
|
71cc4c3860
|
修复版本库列表删除按钮在页面外的BUG
|
11 years ago |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
11 years ago |
|
sw
|
395ae35a0e
|
#1148 调整所有日期为选择，不可手动输入
|
11 years ago |
|
z9hang
|
eeccb9da82
|
项目模块配置不勾选却仍然显示的问题
|
11 years ago |
|
z9hang
|
bce403f624
|
#1242 点击项目得分在弹出的框中点击各项目得分明细反应慢。原因需要向服务器请求数据。解决：使用js在客户端处理各链接，不在向服务器发送请求
|
11 years ago |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
67737d8dd9
|
修复项目成员列表翻到第五页后页面布局不正常的问题 #1208
解决方案：强制换行
|
11 years ago |
linhk
|
20b8bf00b6
|
修改部分项目关注不能及时更新Bug
|
11 years ago |
|
z9hang
|
36329200b7
|
直接访问积分链接报错问题，原因：1项目积分有个方法修改了名字此处未改。2个人积分链有个变量未赋值
|
11 years ago |
|
sw
|
fbb19480f5
|
修复火狐不兼容自动换行的问题
|
11 years ago |
|
sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
cb8b0e0f41
|
admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数）
|
11 years ago |
|
sw
|
eb5d1c9efe
|
修复项目动态首页文明名过长超出页面的BUG
|
11 years ago |
|
linhk
|
9f3392eba8
|
删除主留言时确认删除的提示信息
|
11 years ago |
|
z9hang
|
27e15e6a9a
|
部分项目提交次数显示不正确问题
|
11 years ago |
|
z9hang
|
85a95262fe
|
项目得分细节中文档得分点击无反应问题
|
11 years ago |
|
linhk
|
66dfa1ce4f
|
解决删除项目主留言分页Url错误和页数错误的Bug
|
11 years ago |
|
linhk
|
4c57136a1d
|
项目留言删除功能
|
11 years ago |
|
z9hang
|
9039755fc5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ed3e9e3a03
|
项目成员列表积分计算的初步优化（降低访问速度）
|
11 years ago |
|
sw
|
a7e066add8
|
修复项目得分无法显示详细信息的BUG
|
11 years ago |
|
sw
|
012791e44d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
 zhanghaitao
|
13becbefb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/show.html.erb
|
11 years ago |
|
sw
|
5a7aabd7cf
|
#1357
1.注释无效代码
2.修改wiki、DTS测试logo不见的BUG
|
11 years ago |
|
zhanghaitao
|
13717dc3a3
|
缺陷界面选项功能的屏蔽；私有缺陷的显示条件修改
|
11 years ago |
|
z9hang
|
7e00890667
|
项目工具集部分工具图标缺失问题
|
11 years ago |
|
sw
|
0d398fdc17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6f5df31d14
|
去掉多出来的图片
|
11 years ago |
|
z9hang
|
12434e22c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4cea972e56
|
micro版图片丢失问题
|
11 years ago |
|
sw
|
8d03068ce2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
linhk
|
fcaeb86687
|
项目‘课程 添加成员显示Bug修改
|
11 years ago |
|
sw
|
ae61ccaca9
|
修改动态首页显示样式
|
11 years ago |
|
zhanghaitao
|
a4441bca37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
9d0f759a71
|
#939 项目动态旗帜时间的修改
|
11 years ago |
|
z9hang
|
e65487d527
|
项目成员个人得分显示
|
11 years ago |
|
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
zhanghaitao
|
dbe8456fd5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
eac85b338f
|
标示错误修改
|
11 years ago |
|
linhk
|
cb4869fd20
|
解决新建版本库名长255个字符时异常
解决版本库名长时，界面显示错误
|
11 years ago |
|
zhanghaitao
|
68a86c5e5d
|
#873 #829问题修改
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
|
sw
|
7b32debb92
|
修复谷歌浏览器用户列表翻到第5页后角色信息和翻页列表在同一行的BUG
|
11 years ago |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
 yanxd
|
a8ed4272cc
|
ckeditor: 描述中网址后面带有换行，projects列表出错
|
11 years ago |
|
sw
|
cc215e6c7b
|
修复个人动态图片显示不准确的问题
|
11 years ago |
|
yanxd
|
4fae105b96
|
project testing.
|
11 years ago |
|
sw
|
ea322d6177
|
修复项目提交时间字的长度过长时会换行的BUG
|
11 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
890bc7459d
|
修改项目列表页面当管理人员过多时，显示更多。点击更多按钮，跳转到该项目的成员列表页面
|
11 years ago |
|
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
11 years ago |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
11 years ago |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
11 years ago |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
11 years ago |
|
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
11 years ago |
|
sw
|
6f858795ef
|
项目模块配置未选中wiki时，取消左侧项目工具集的WIKI显示
|
11 years ago |
 nwb
|
62af03debd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
ca7ad03a05
|
1.优化课程动态信息
2.优化项目动态信息
|
11 years ago |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
