 huang
|
aa2a41d368
|
修改文档 从项目动态点入后导航栏显示错误
|
10 years ago |
whimlex
|
93df92e660
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
10 years ago |
|
huang
|
49cf6e1319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
10 years ago |
 sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
10 years ago |
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
10 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
10 years ago |
|
sw
|
aa3ab86fb0
|
#2013 个人主页--留言--留言输入框不见了
|
10 years ago |
|
guange
|
e5e46819b4
|
#867 新建缺陷：校验失败也要保存上传文件信息
|
10 years ago |
 z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
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
|
58cbfa6af7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
z9hang
|
87f0d73ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
10 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
10 years ago |
|
sw
|
8a7fc85e8b
|
系统中部分回复的本地化文件缺失
|
10 years ago |
|
whimlex
|
57c97f3dc8
|
层级回复留言标签修改
|
10 years ago |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
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 |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
10 years ago |
|
sw
|
d1912865d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0402fee6de
|
修改邮件邀请
|
10 years ago |
|
huang
|
402f3701da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
10 years ago |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
10 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
10 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
10 years ago |
|
lizanle
|
53d144e8d2
|
project动态当前页在最后。
|
10 years ago |
|
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
10 years ago |
|
sw
|
6a7c7a732c
|
修改首页报500
|
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 |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
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 |
|
sw
|
fea7bd6ad1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
3f3bb62678
|
非项目成员添加新闻、添加讨论区按钮不可见
|
10 years ago |
|
lizanle
|
a701eb91a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
10 years ago |
|
alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
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
|
f898e2aa91
|
16:22
|
10 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
10 years ago |
|
z9hang
|
754acc6945
|
移动端版本管理
|
10 years ago |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
e58f5d4af5
|
#1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
10 years ago |
|
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
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
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
10 years ago |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
10 years ago |
|
sw
|
45fe622f26
|
1、修改进入系统首页报错
2、增加组织的默认图片
|
10 years ago |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
10 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
10 years ago |
|
sw
|
d1edd86e11
|
1、修改组织首页项目获取
2、修改此组织没有项目时的样式
|
10 years ago |
|
sw
|
7f249d29f4
|
修整页面代码
|
10 years ago |
|
sw
|
a2d986f70c
|
修改页面代码
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
10 years ago |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
10 years ago |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
10 years ago |
|
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
10 years ago |
|
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
90d9e77b32
|
修复课程主页没有2015年课程
|
10 years ago |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
10 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
10 years ago |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
10 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
10 years ago |
|
sw
|
0b41afa571
|
修改作业匿评界面，左侧附件名显示混乱
|
10 years ago |
|
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
10 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
10 years ago |
|
sw
|
a752ade770
|
#1922 测试版--平台上传附件功能，附件显示问题
|
10 years ago |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
56fa330fed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
26b1f9f433
|
修改企业版中存在的一些bug
最多只显示十个项目
提示的样式
代码优化
|
10 years ago |
|
sw
|
7ab5eeab65
|
#1839上传附件名延后省略号显示
|
10 years ago |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
10 years ago |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
a29887cfed
|
关闭问卷后，发布问卷和其他的发布问卷框框未对齐
|
10 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
10 years ago |
|
sw
|
6261d95eba
|
首页显示异常
|
10 years ago |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
10 years ago |
|
sw
|
79d1a069c2
|
修改公司名字过长首页显示有问题
|
10 years ago |
|
huang
|
2a65ba3af8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1dd8724656
|
修改样式
|
10 years ago |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
10 years ago |
|
sw
|
2cc31e5c72
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
10 years ago |
|
sw
|
f3b99ec045
|
修改项目首页搜索按钮移位
|
10 years ago |
|
sw
|
9b854f4264
|
修改编辑作业列表显示异常
|
10 years ago |
|
sw
|
d76c0a5365
|
修改新建作业界面显示异常
|
10 years ago |
|
whimlex
|
6a22e47b0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
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 |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
10 years ago |
|
alan
|
e34e87bb82
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
lizanle
|
999b395763
|
添加Kaminari分页样式文件，
_paginator.html.erb 这是总的入口文件，可以通过修改它来调整显示的整体结构
比如我不需要“首页”，”末页“这两个链接，那么我就在这个文件里面将对应的代码删除
_page.html.erb 对应页码链接
_first_page.html.erb / _last_page.html.erb 对应“首页”和“末页”的链接
_prev_page.html.erb / _next_page.html.erb 对应“上一页”和“下一页”的链接
_gap.html.erb 空隙的显示，默认是中间的省略号(...)
|
10 years ago |
|
lizanle
|
a47cb8eb65
|
去掉原有的样式分页样式
|
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
Signed-off-by: alan <547533434@qq.com>
|
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
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
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
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 |
|
lizanle
|
abc5dd1c74
|
添加表格样式
|
10 years ago |
|
sw
|
87fdd840ec
|
首页加入项目增加已是当前项目的判断
|
10 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
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
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
10 years ago |
|
sw
|
6bca666f08
|
#1896 课程--问卷调查--新建题目时点击确定按钮无反应
|
10 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
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
Conflicts:
Gemfile
config/routes.rb
|
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
|
91a8078cae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
cf1cd9201c
|
修改上传资源弹框样式
|
10 years ago |
|
alan
|
20f4b5c44b
|
修改《contest新建的样式》
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
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
|
97c7ccac16
|
增加关闭问卷功能
|
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
|
修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
|
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
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
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
|
11 years ago |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
11 years ago |
|
alan
|
7ef6f8adfb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5e4279e158
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2450bb777d
|
修改问卷统计界面样式
|
11 years ago |
|
whimlex
|
14685f2656
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
alan
|
38da932f4c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/application.rb
|
11 years ago |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
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 |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
b20204fedd
|
修改《邮件重发一样引发的bug》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
sw
|
bb64dc9452
|
修改问卷调查按钮的样式
|
11 years ago |
|
sw
|
89ee38481b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
11 years ago |
|
sw
|
ae31d0b861
|
#1851课程作业增加状态显示
|
11 years ago |
