 sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 cxt
|
a991500e55
|
登录首页的样式修改
|
10 years ago |
|
sw
|
1cbda41997
|
11
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
10 years ago |
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
10 years ago |
|
guange
|
9e9f373a76
|
发布作业优化
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
cxt
|
d667e6359c
|
切换
|
10 years ago |
|
sw
|
d0f7f89db3
|
迁移文件修改
|
10 years ago |
|
sw
|
955ef3d5fd
|
取消打印
|
10 years ago |
|
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
10 years ago |
 huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
62c657a827
|
用户留言增加登录判断，并且删除匿名用户留言数据
|
10 years ago |
|
sw
|
9ddb4f6683
|
删除匿名用户在缺陷中的回复
|
10 years ago |
|
sw
|
093273968b
|
删除匿名用户在缺陷中的回复
|
10 years ago |
|
huang
|
c579ee51fe
|
增加点击时间表
|
10 years ago |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
10 years ago |
|
sw
|
1bda18afff
|
111
|
10 years ago |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
10 years ago |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
10 years ago |
|
huang
|
6dff29f931
|
添加时间迁移
|
10 years ago |
|
huang
|
b5c0d03590
|
添加迁移
代码优化
|
10 years ago |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
10 years ago |
|
huang
|
e652e92217
|
新增消息迁移
|
10 years ago |
|
huang
|
7ed93c1d80
|
消息总表数据迁移
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
huang
|
43170c696c
|
迁移总表时间
|
10 years ago |
|
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
10 years ago |
|
sw
|
98d533e8f9
|
1、整理迁移文件
2、个人动态添加与更新判断不正确
|
10 years ago |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
10 years ago |
|
sw
|
c5b0b4164c
|
迁移文件back
|
10 years ago |
|
huang
|
f438d300dd
|
消息数据迁移（未完）
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
suntao
|
b6d58b1b58
|
样式调整
|
10 years ago |
|
guange
|
ad0b14b768
|
schema
|
10 years ago |
|
sw
|
5b9c9312f5
|
留言界面样式修改
|
10 years ago |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
10 years ago |
|
cxt
|
bd00870eba
|
个人主页
|
10 years ago |
|
sw
|
ffe40b399d
|
个人动态表重构
|
10 years ago |
|
sw
|
44419eff04
|
rake db
|
10 years ago |
 lizanle
|
256ccedfe8
|
schema
|
10 years ago |
 ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
10 years ago |
|
huang
|
0da75afc88
|
消息排序（公共表）
|
10 years ago |
|
huang
|
7961e3db6f
|
建立公共表
|
10 years ago |
|
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
10 years ago |
|
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2d05d1f7d0
|
0
|
10 years ago |
|
huang
|
d575ce5e5f
|
消息公共表
|
10 years ago |
|
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
10 years ago |
|
sw
|
3b3712891b
|
111
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
10 years ago |
|
sw
|
535145f8f2
|
11
|
10 years ago |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
cxt
|
4c87071765
|
个人动态
|
10 years ago |
|
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
10 years ago |
|
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
10 years ago |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
10 years ago |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
10 years ago |
|
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接，添加查询条件。
|
10 years ago |
|
sw
|
c97ec1a370
|
111
|
10 years ago |
|
sw
|
0ba9cfe5dd
|
提升迁移文件效率
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
sw
|
5d000ea431
|
增加系统评分
|
10 years ago |
|
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
10 years ago |
|
sw
|
35d6c76a8e
|
部分课程资源创建时间不正确
|
10 years ago |
|
huang
|
a5c941f48c
|
课程发布通知消息提示
|
10 years ago |
|
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
10 years ago |
|
sw
|
ce76308864
|
课程动态，历史数据的迁移
|
10 years ago |
|
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
10 years ago |
|
sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
10 years ago |
|
cxt
|
a872692984
|
为activities表添加created_at字段，并导入数据
|
10 years ago |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
|
sw
|
9da18bcad4
|
老师测试结果的返回
|
10 years ago |
|
sw
|
41cba6db6a
|
增加每组测试的编译错误信息的存储
|
10 years ago |
|
sw
|
5e885d9417
|
老师布置编程作业界面增加测试，以及测试结果的存储
|
10 years ago |
|
lizanle
|
b22f9b221b
|
db_schema.rb
|
10 years ago |
|
lizanle
|
e74ca78b0e
|
日志级别在debug环境下 调整为debug
|
10 years ago |
|
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
10 years ago |
|
sw
|
66924560c4
|
编程作业上线
|
10 years ago |
|
sw
|
baccd28493
|
迁移文件出错
|
10 years ago |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
10 years ago |
|
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
10 years ago |
|
huang
|
5926b2fe81
|
dts测试
|
10 years ago |
|
huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
 yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
|
sw
|
536a9d7b6b
|
修改表名
|
10 years ago |
|
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
yutao
|
b7c4449f4b
|
个人主页
|
10 years ago |
|
guange
|
3614c6ee9b
|
project同步
|
10 years ago |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
10 years ago |
|
sw
|
11191f6743
|
与编程作业服务器联调
|
10 years ago |
|
sw
|
24d6c8e17e
|
编程作业表增加question_id字段
|
10 years ago |
|
sw
|
8f3ac85fec
|
1、作业描述、编程作业代码字段改为longtext
2、提交作业界面显示修改
3、编程作业不可以修改和删除control判断
|
10 years ago |
|
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
10 years ago |
|
sw
|
17a9a1023a
|
增加编程作业中教辅比例
|
10 years ago |
|
lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看，
获取作业的匿评率
|
10 years ago |
|
sw
|
08c9d5a498
|
迟交扣分记录
|
10 years ago |
|
sw
|
976c4ddd19
|
增加迁移文件
|
10 years ago |
|
sw
|
156f2f9a2e
|
部分评分数据重复
|
10 years ago |
|
lizanle
|
2ba87477fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
sw
|
358c344ca5
|
迁移文件错误
|
10 years ago |
|
sw
|
044370b958
|
作品创建时间迁移
|
10 years ago |
|
lizanle
|
96220a0147
|
schema.rb
|
10 years ago |
|
sw
|
243fa0af89
|
admin用户能操作作业和作品
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
c8128cffea
|
删除无效动态
|
10 years ago |
|
sw
|
8d23815169
|
数据迁移不完整
|
10 years ago |
|
sw
|
bdbcc52320
|
评分计算的数据迁移
|
10 years ago |
|
sw
|
c1d753f634
|
数据迁移文件增加个人动态中的迁移
|
10 years ago |
|
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
10 years ago |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
 alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
10 years ago |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
10 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
a27b3e9dc6
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
lizanle
|
42fab7c784
|
schema
|
10 years ago |
|
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
10 years ago |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
10 years ago |
|
sw
|
dc1971f507
|
学生作品详细得分表，以及相关的关系
|
10 years ago |
|
sw
|
08b469fa3c
|
学生作品匿评分配表
|
10 years ago |
|
sw
|
3abfaed081
|
学生提交作品表，以及相关的关系
|
10 years ago |
|
sw
|
bb3e0c4c7e
|
手动评分作业、编程作业相关表的添加以及关系的定义
|
10 years ago |
|
sw
|
7bfd7755f7
|
增加手动评分相关表，以及关系的定义
|
10 years ago |
|
sw
|
a43a6289e4
|
新的老师布置的作业表添加，以及相关关系定义
|
10 years ago |
|
guange
|
907d89e1cc
|
merge
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
10 years ago |
