 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 |
|
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 |
|
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 |
|
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 |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
10 years ago |
|
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
10 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
10 years ago |
|
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
10 years ago |
|
sw
|
2ade53053b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c60ea1db84
|
111
|
10 years ago |
|
lizanle
|
71004e2f78
|
课程学生列表显示太慢，需要对表加索引
|
10 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
lizanle
|
2f4ac77838
|
schema
|
10 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
10 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
10 years ago |
|
sw
|
92eabdbecd
|
修改作业历史数据的问题
|
10 years ago |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
10 years ago |
|
alanlong9278
|
945192f1d8
|
添加memcached配置
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
lizanle
|
871623b7c8
|
commit
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
guange
|
11c1bbb525
|
解决打包时文件过多插库错误
|
10 years ago |
|
lizanle
|
b13d30bf20
|
自动更改
|
10 years ago |
|
huang
|
f528584345
|
添加迁移--项目类型默认值
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
lizanle
|
590dd0cac5
|
删除这个demo的数据表创建脚本
|
11 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
11 years ago |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
11 years ago |
|
lizanle
|
04c064ddc8
|
nothing
|
11 years ago |
|
lizanle
|
f59e9a3f7e
|
添加owner_type字段
|
11 years ago |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
11 years ago |
|
lizanle
|
bfc9cdb3a4
|
资源表
|
11 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
a9cafb2241
|
新建DiscussDemo表
|
11 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
 z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
11 years ago |
|
lizanle
|
437fc243ad
|
给每个项目添加一条初始创建信息，如果有menber，最早加进来的就算创始人,并给projects表的更新创建人
|
11 years ago |
|
guange
|
c893a2d99b
|
迁移优化，原来需要1800秒，现只需800秒
|
11 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 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
|
11 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
11 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
11 years ago |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
11 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
11 years ago |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
z9hang
|
222e2cc135
|
修改ErrorHandler未能加载问题
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
11 years ago |
