 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 |
|
sw
|
945b9ff9cf
|
修复进入我的动态，关注人没有进行权限过滤的BUG
|
10 years ago |
 alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
sw
|
3e3cde0805
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
|
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
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
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
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
sw
|
e58f5d4af5
|
#1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
lizanle
|
10faab0129
|
新建的项目发布新问题报500
|
10 years ago |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
10 years ago |
|
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
10 years ago |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
10 years ago |
|
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
10 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
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
|
d947a914cc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
lizanle
|
8d322edb90
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/views/projects/show.html.erb
|
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 |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
10 years ago |
|
sw
|
a64671f9de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
10 years ago |
|
z9hang
|
d1651f7252
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
d01aa5f15c
|
关注接口限制不能关注自己
|
10 years ago |
|
sw
|
ef5b7c9fca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
7f249d29f4
|
修整页面代码
|
10 years ago |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
10 years ago |
|
z9hang
|
509a37a575
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
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
|
2c4e864080
|
#1949 学生可以通过url访问老师并未发布的问卷并进行作答
|
10 years ago |
|
sw
|
da21e61afd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
10 years ago |
|
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
10 years ago |
|
z9hang
|
7b5eb9db8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
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
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
d999a9f4a6
|
修复新建课程时报错的BUG
|
10 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
10 years ago |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
10 years ago |
|
z9hang
|
196ceff138
|
返回课程的接口补上当前用户是否为课程成员，课程老师信息
|
11 years ago |
|
alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
11 years ago |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
11 years ago |
|
z9hang
|
85782cdb8d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
11 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
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
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
z9hang
|
103a411b40
|
修改用户搜索接口
|
11 years ago |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
11 years ago |
|
sw
|
2ceb21b83b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
11 years ago |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
11 years ago |
|
z9hang
|
cc83b30fc6
|
修正搜索用户接口，添加课程动态接口
|
11 years ago |
|
sw
|
859889b750
|
简化查询匿评数量的代码
|
11 years ago |
|
sw
|
3c8f851c37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
4cdb3c83dd
|
增加获取用户在指定课程内作业数量的接口
|
11 years ago |
|
sw
|
0b41afa571
|
修改作业匿评界面，左侧附件名显示混乱
|
11 years ago |
|
z9hang
|
cd25628208
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
b1903dba11
|
添加课程留言接口
|
11 years ago |
|
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
11 years ago |
|
sw
|
50244e6860
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
|
z9hang
|
0dfa428377
|
手机ＡＰＩ添加回复留言接口
|
11 years ago |
|
z9hang
|
ef203ff40c
|
修正作业留言接口
|
11 years ago |
|
z9hang
|
d6813e5996
|
项目新闻报错问题，作业留言接口
|
11 years ago |
|
z9hang
|
d6b82c3549
|
修正课程通知评论接口
|
11 years ago |
|
z9hang
|
4fdc1b97a5
|
配置API comment接口，修正显示课程通知接口未判断权限问题
|
11 years ago |
|
z9hang
|
3cd97f8a70
|
API添加comment模块
|
11 years ago |
|
z9hang
|
d1e2bfd6c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6d79c2cf83
|
手机端ＡＰＩ添加新闻评论实体Comment，新闻实体中引用Comment,课程新闻列表添加权限判断，并修正该接口不可用问题
|
11 years ago |
|
sw
|
da56477ed0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
7e6d4e6215
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8216453a02
|
匿评作品详情返回结果中添加comment_status字段 0:所属作业尚未开启匿评，1：匿评中 2：匿评结束
|
11 years ago |
|
z9hang
|
87e658a0f1
|
修改评论接口，匿评结束后依然可以评论（属于留言）
|
11 years ago |
|
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
11 years ago |
|
z9hang
|
9708c50899
|
添加作品评分接口
|
11 years ago |
|
sw
|
a752ade770
|
#1922 测试版--平台上传附件功能，附件显示问题
|
11 years ago |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
56fa330fed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
26b1f9f433
|
修改企业版中存在的一些bug
最多只显示十个项目
提示的样式
代码优化
|
11 years ago |
|
sw
|
7ab5eeab65
|
#1839上传附件名延后省略号显示
|
11 years ago |
|
sw
|
320ee9289a
|
#1897 修改点击DTS测试之后，TAB页背景色变化
|
11 years ago |
|
alan
|
44c783a61b
|
帖子的邮件通知改成只有版主收到
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
11 years ago |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
fa8475387a
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
8f5e613477
|
添加一些对代码理解的注释
|
11 years ago |
|
sw
|
a29887cfed
|
关闭问卷后，发布问卷和其他的发布问卷框框未对齐
|
11 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
11 years ago |
|
sw
|
6261d95eba
|
首页显示异常
|
11 years ago |
|
z9hang
|
944dc33212
|
注释掉API文档
|
11 years ago |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
11 years ago |
|
alan
|
9681e08600
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile.lock
|
11 years ago |
|
sw
|
79d1a069c2
|
修改公司名字过长首页显示有问题
|
11 years ago |
|
huang
|
2a65ba3af8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
1dd8724656
|
修改样式
|
11 years ago |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
alan
|
48cb0e0450
|
email verify
|
11 years ago |
|
sw
|
2cc31e5c72
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
11 years ago |
|
sw
|
f3b99ec045
|
修改项目首页搜索按钮移位
|
11 years ago |
|
sw
|
9b854f4264
|
修改编辑作业列表显示异常
|
11 years ago |
|
sw
|
d76c0a5365
|
修改新建作业界面显示异常
|
11 years ago |
|
sw
|
8289ca6c89
|
11111
|
11 years ago |
|
whimlex
|
6a22e47b0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
11 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
11 years ago |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
11 years ago |
|
alan
|
e34e87bb82
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 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 空隙的显示，默认是中间的省略号(...)
|
11 years ago |
|
lizanle
|
a47cb8eb65
|
去掉原有的样式分页样式
|
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
|
269f1835b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
34c68a59fc
|
关闭问卷之后老师容许查看统计结果
|
11 years ago |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
661dbe5219
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a467736a5e
|
修改《多字段唯一性判断》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
666ebf9b5b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
9e470fa25c
|
meigia
|
11 years ago |
|
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
11 years ago |
|
sw
|
31c78279ea
|
删除多余的一个end
|
11 years ago |
|
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 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
|
11 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
lizanle
|
22dd4981c0
|
修改分页函数
|
11 years ago |
|
lizanle
|
b453d16228
|
将controller里的两个方法挪到helper
|
11 years ago |
|
lizanle
|
90649209ca
|
封装，简化，重新编排代码格式，并删掉了一些无用的方法代码
|
11 years ago |
|
lizanle
|
abc5dd1c74
|
添加表格样式
|
11 years ago |
|
lizanle
|
0232826a6e
|
上次修改引入bug:关键字查询不到任何东西
|
11 years ago |
|
lizanle
|
e761cd5f22
|
关键字查询会丢失样式
|
11 years ago |
|
sw
|
87fdd840ec
|
首页加入项目增加已是当前项目的判断
|
11 years ago |
|
lizanle
|
852bb940a2
|
过滤掉日志中日志分析的请求
|
11 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
11 years ago |
|
sw
|
0d5384c6d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
97ec208b1a
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
whimlex
|
deadea81fa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 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
|
11 years ago |
|
lizanle
|
f3f590a834
|
# 这写变量发现没有用而且拖慢速度
#@teachers= searchTeacherAndAssistant(@course)
#@canShowRealName = isCourseTeacher(User.current.id,@course)
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
6bca666f08
|
#1896 课程--问卷调查--新建题目时点击确定按钮无反应
|
11 years ago |
|
sw
|
c56f641163
|
修改首页加入项目按钮没反应
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
2978d9020f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
c366cc90e7
|
修改删除问卷后相关BUG
|
11 years ago |
|
sw
|
a772ef329d
|
修改问卷时增加问卷标题不能为空的提示
|
11 years ago |
|
sw
|
108435f933
|
新增题目时，增加标题不能为空的js验证
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
11 years ago |
|
sw
|
af7e605f76
|
添加新闻时，“提交”按钮和“取消”按钮之间有一竖
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b7c7cc4c64
|
意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致
|
11 years ago |
|
z9hang
|
a6488da7fa
|
修改ＡＰＩ上线问题
|
11 years ago |
|
z9hang
|
f7dbb24d35
|
修改测试版上线问题
|
11 years ago |
|
z9hang
|
222e2cc135
|
修改ErrorHandler未能加载问题
|
11 years ago |
|
z9hang
|
f793cff398
|
改为开发模式下才调用api文档
|
11 years ago |
|
z9hang
|
91a8078cae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
cf1cd9201c
|
修改上传资源弹框样式
|
11 years ago |
|
alan
|
20f4b5c44b
|
修改《contest新建的样式》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5434a5b087
|
修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
36dfd7c77c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
00c0ddc600
|
admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
lizanle
|
5afbf6dbca
|
调整了注释
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
sw
|
56700f4d62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
649c65fbe2
|
国际化部分代码
|
11 years ago |
|
sw
|
fe06ca503a
|
增加poll colsed_at的赋值
|
11 years ago |
|
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
|
z9hang
|
4b3621905e
|
修正课程成员搜索bug
|
11 years ago |
|
whimlex
|
0ff22b1ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e5e24c1163
|
resolve conflict
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
alan
|
36ec204f40
|
修改《公共贴吧中，回复了帖子后，重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f1495686e9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
0944cc4ca8
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d135274281
|
修改重复加入项目提示语
|
11 years ago |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
11 years ago |
|
sw
|
2f8d57797c
|
增加弹出框的宽度
|
11 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 |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
z9hang
|
b2396df68c
|
优化下代码
|
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 |
|
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
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 |
|
z9hang
|
4a672416e3
|
匿评作品详情接口添加评论的回复输出
|
11 years ago |
|
lizanle
|
df88cb6eba
|
管理员才能查看
|
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 |
|
alan
|
942035f698
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
lizanle
|
27fde6c641
|
添加注释
|
11 years ago |
|
huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
03ae5fdeac
|
添加注释
|
11 years ago |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
11 years ago |
|
sw
|
ae31d0b861
|
#1851课程作业增加状态显示
|
11 years ago |
|
sw
|
249b08392d
|
#1856 修改问卷列表页面，发布问卷、取消发布后弹出界面显示不正确
|
11 years ago |
|
sw
|
81f5a5e624
|
#1854学生点击查看已提交过的问卷时，多行主观题中显示有html元素
|
11 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
|
whimlex
|
e950208e38
|
sina邮箱IE样式
|
11 years ago |
|
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
11 years ago |
|
whimlex
|
1e36ca504a
|
多种邮箱邮件样式调整，回复内容样式更改
|
11 years ago |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
4fe8b23069
|
去掉不必要的代码，修改注释，格式
|
11 years ago |
|
huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
11 years ago |
|
alan
|
8f1249390a
|
修改《发送多封相同邮件》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
11 years ago |
|
lizanle
|
8b6750c1ed
|
删除日志修改为只能修改当天的日志：这样子保护原来的日志，又能进行当天的调试
|
11 years ago |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
11 years ago |
|
alan
|
24dfeb1614
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
683625066e
|
修改进入未批列表修改排序后，老师进行评分之后排序会回到默认排序额问题
|
11 years ago |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
11 years ago |
|
z9hang
|
a4d7e5f932
|
匿评作品详情显示接口
|
11 years ago |
|
whimlex
|
0c0160ac2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
11 years ago |
|
lizanle
|
c0b12ac60c
|
去掉冗余代码
|
11 years ago |
|
lizanle
|
7fc2ea0484
|
修改国际化文件名字
|
11 years ago |
|
lizanle
|
566f59c49e
|
修改只有管理员才能查看
|
11 years ago |
|
lizanle
|
0502eb16a6
|
添加了访问统计页面和耗时分析页面
|
11 years ago |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
11 years ago |
|
lizanle
|
061e4599c3
|
重构，修正了许多的空指针异常
|
11 years ago |
|
lizanle
|
c668b72dac
|
重构
|
11 years ago |
|
sw
|
d68486669e
|
#1830课程--标签字体压线
|
11 years ago |
|
z9hang
|
b6207c0a47
|
关闭匿评
|
11 years ago |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
11 years ago |
|
sw
|
520e9c73aa
|
#1836 未登录或者没有权限访问私有项目时，跳转到403页面
|
11 years ago |
|
alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0b2fa35a42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
77b8bf18c8
|
#1842 修改部分页面描述问题
|
11 years ago |
