sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |
huang
|
ba2474e480
|
关闭匿评消息
|
2015-09-18 17:38:19 +08:00 |
sw
|
20b4c056a8
|
历史数据:普通作业改为匿评作业
|
2015-09-18 16:19:30 +08:00 |
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 11:34:29 +08:00 |
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
2015-09-18 09:32:25 +08:00 |
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
2015-09-17 20:33:36 +08:00 |
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
2015-09-17 15:50:33 +08:00 |
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:24:58 +08:00 |
sw
|
84bb5af86f
|
增加教师优先字段
|
2015-09-17 10:24:37 +08:00 |
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
2015-09-17 08:46:43 +08:00 |
huang
|
b0ccf9037a
|
邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
lizanle
|
2fa01f32fb
|
schema
|
2015-09-15 11:28:08 +08:00 |
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
sw
|
da269ef716
|
发布作业,请先输入作业标题
|
2015-09-11 17:27:07 +08:00 |
cxt
|
42ddc0bf3c
|
迁移文件
|
2015-09-11 17:19:40 +08:00 |
cxt
|
9dc3f43af1
|
修改迁移文件
|
2015-09-11 17:15:05 +08:00 |
cxt
|
312955e5dc
|
迁移文件
|
2015-09-11 16:45:50 +08:00 |
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
cxt
|
585818fe7a
|
讨论区动态重复出现
|
2015-09-11 16:42:24 +08:00 |
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
2015-09-11 11:31:59 +08:00 |
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
huang
|
66251c8d30
|
添加功能:管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 16:54:21 +08:00 |
cxt
|
a991500e55
|
登录首页的样式修改
|
2015-09-09 10:21:44 +08:00 |
sw
|
1cbda41997
|
11
|
2015-09-08 14:43:59 +08:00 |
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
2015-09-08 10:28:21 +08:00 |
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-08 08:50:00 +08:00 |
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
2015-09-08 08:45:29 +08:00 |
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
2015-09-07 23:47:14 +08:00 |
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |
cxt
|
aa0c0dab83
|
添加“我的动态”
|
2015-09-07 15:01:08 +08:00 |
cxt
|
d667e6359c
|
切换
|
2015-09-07 11:12:04 +08:00 |
sw
|
d0f7f89db3
|
迁移文件修改
|
2015-09-06 17:42:55 +08:00 |
sw
|
955ef3d5fd
|
取消打印
|
2015-09-06 17:28:09 +08:00 |
sw
|
88397d58d0
|
1、讨论区新建帖子时增加权限判断
2、删除历史的匿名用户发布帖子的数据
|
2015-09-06 17:27:20 +08:00 |
huang
|
b2e25e8afc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-06 17:19:33 +08:00 |
sw
|
62c657a827
|
用户留言增加登录判断,并且删除匿名用户留言数据
|
2015-09-06 17:06:05 +08:00 |
sw
|
9ddb4f6683
|
删除匿名用户在缺陷中的回复
|
2015-09-06 16:38:24 +08:00 |
sw
|
093273968b
|
删除匿名用户在缺陷中的回复
|
2015-09-06 16:38:12 +08:00 |
huang
|
c579ee51fe
|
增加点击时间表
|
2015-09-06 15:31:48 +08:00 |
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
sw
|
1bda18afff
|
111
|
2015-09-06 09:31:09 +08:00 |
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
2015-09-02 21:33:03 +08:00 |
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
huang
|
48ddee478e
|
默认更新为已读
公共贴吧区分已读和未读消息
|
2015-09-02 11:00:32 +08:00 |
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
huang
|
6dff29f931
|
添加时间迁移
|
2015-08-31 17:45:14 +08:00 |
huang
|
b5c0d03590
|
添加迁移
代码优化
|
2015-08-31 16:41:52 +08:00 |
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
2015-08-31 09:33:20 +08:00 |
huang
|
e652e92217
|
新增消息迁移
|
2015-08-30 11:20:37 +08:00 |
huang
|
7ed93c1d80
|
消息总表数据迁移
|
2015-08-29 19:26:23 +08:00 |
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
huang
|
43170c696c
|
迁移总表时间
|
2015-08-29 17:09:44 +08:00 |
huang
|
2a17cfc741
|
Merge branch 'szzh' into dev_hjq
|
2015-08-29 16:09:30 +08:00 |
huang
|
353e2f5d18
|
添加课程消息迁移
|
2015-08-29 16:08:09 +08:00 |
sw
|
98d533e8f9
|
1、整理迁移文件
2、个人动态添加与更新判断不正确
|
2015-08-29 15:34:18 +08:00 |
guange
|
18bfe1fc73
|
jquery升到1.11
|
2015-08-29 11:59:52 +08:00 |
sw
|
c5b0b4164c
|
迁移文件back
|
2015-08-29 11:54:28 +08:00 |
huang
|
f438d300dd
|
消息数据迁移(未完)
|
2015-08-29 11:50:08 +08:00 |
guange
|
1462ea09f3
|
测试代码功能完成
|
2015-08-28 12:04:49 +08:00 |
suntao
|
b6d58b1b58
|
样式调整
|
2015-08-28 11:55:34 +08:00 |
guange
|
ad0b14b768
|
schema
|
2015-08-26 22:11:39 +08:00 |
sw
|
5b9c9312f5
|
留言界面样式修改
|
2015-08-26 17:42:02 +08:00 |
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 15:04:44 +08:00 |
huang
|
1dce1a2a4c
|
老师更新作品评阅消息通知
区分第一次评阅和后面的评阅
|
2015-08-26 14:47:53 +08:00 |
cxt
|
bd00870eba
|
个人主页
|
2015-08-25 19:24:23 +08:00 |
sw
|
ffe40b399d
|
个人动态表重构
|
2015-08-25 17:54:29 +08:00 |
sw
|
44419eff04
|
rake db
|
2015-08-25 15:39:50 +08:00 |
lizanle
|
256ccedfe8
|
schema
|
2015-08-25 15:16:24 +08:00 |
ouyangxuhua
|
d7de5fc480
|
更改消息样式
|
2015-08-25 13:04:46 +08:00 |
huang
|
0da75afc88
|
消息排序(公共表)
|
2015-08-25 11:10:08 +08:00 |
huang
|
7961e3db6f
|
建立公共表
|
2015-08-24 22:47:48 +08:00 |
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
huang
|
4af3c9816c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-24 17:53:55 +08:00 |
huang
|
2d05d1f7d0
|
0
|
2015-08-24 17:51:44 +08:00 |
huang
|
d575ce5e5f
|
消息公共表
|
2015-08-24 17:51:19 +08:00 |
ouyangxuhua
|
f0483b6de8
|
更新新闻viewed
|
2015-08-24 17:45:00 +08:00 |
sw
|
3b3712891b
|
111
|
2015-08-24 11:08:16 +08:00 |
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
sw
|
535145f8f2
|
11
|
2015-08-21 16:35:52 +08:00 |
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
lizanle
|
11d6298efa
|
资源库 合并后css样式冲突
|
2015-08-21 14:37:19 +08:00 |
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
cxt
|
4c87071765
|
个人动态
|
2015-08-20 17:24:34 +08:00 |
huang
|
a15ab2c72e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-08-20 14:07:11 +08:00 |
sw
|
b52f607b68
|
用户动态 = 参与课程动态 + 参与课程动态
表创建以及相关关系的搭建
|
2015-08-20 11:19:26 +08:00 |
huang
|
6b6f6e0b0d
|
个人主页留言消息推送
|
2015-08-20 09:25:48 +08:00 |
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
2015-08-19 11:06:39 +08:00 |
cxt
|
27ff5471ec
|
超级管理员新增功能页面的分页、添加超链接,添加查询条件。
|
2015-08-18 14:40:12 +08:00 |
sw
|
c97ec1a370
|
111
|
2015-08-15 19:47:50 +08:00 |
sw
|
0ba9cfe5dd
|
提升迁移文件效率
|
2015-08-15 19:47:24 +08:00 |
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
2015-08-15 17:10:02 +08:00 |
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-08-15 17:09:10 +08:00 |
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
sw
|
5d000ea431
|
增加系统评分
|
2015-08-15 17:02:54 +08:00 |
huang
|
9a695b2d09
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/models/poll.rb
|
2015-08-15 16:54:51 +08:00 |
sw
|
35d6c76a8e
|
部分课程资源创建时间不正确
|
2015-08-14 13:55:46 +08:00 |
huang
|
a5c941f48c
|
课程发布通知消息提示
|
2015-08-14 10:19:59 +08:00 |
huang
|
b958340ab6
|
Merge branch 'szzh' into dev_hjq
|
2015-08-14 08:55:41 +08:00 |
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
2015-08-11 17:11:10 +08:00 |
sw
|
ce76308864
|
课程动态,历史数据的迁移
|
2015-08-11 17:02:52 +08:00 |
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
2015-08-11 16:52:04 +08:00 |
sw
|
465af5e2d3
|
增加课程动态,以及课程内相关活动时动态的添加
|
2015-08-11 15:54:05 +08:00 |
cxt
|
a872692984
|
为activities表添加created_at字段,并导入数据
|
2015-08-11 14:49:32 +08:00 |
sw
|
f5cfd7258d
|
修改编程作业时,对已通过测试、未通过测试显示的初始化,以及修改时的结果的存储
|
2015-08-01 14:27:32 +08:00 |
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
2015-08-01 09:41:01 +08:00 |
sw
|
9da18bcad4
|
老师测试结果的返回
|
2015-07-31 13:58:27 +08:00 |
sw
|
41cba6db6a
|
增加每组测试的编译错误信息的存储
|
2015-07-30 21:10:05 +08:00 |
sw
|
5e885d9417
|
老师布置编程作业界面增加测试,以及测试结果的存储
|
2015-07-30 17:38:01 +08:00 |
lizanle
|
b22f9b221b
|
db_schema.rb
|
2015-07-28 11:34:50 +08:00 |
lizanle
|
e74ca78b0e
|
日志级别在debug环境下 调整为debug
|
2015-07-27 10:03:45 +08:00 |
cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-24 09:07:58 +08:00 |
sw
|
66924560c4
|
编程作业上线
|
2015-07-22 16:06:31 +08:00 |
sw
|
baccd28493
|
迁移文件出错
|
2015-07-22 10:48:46 +08:00 |
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
2015-07-22 10:06:55 +08:00 |
guange
|
7d0a53ec86
|
merge
|
2015-07-21 20:56:33 +08:00 |
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
2015-07-21 11:59:15 +08:00 |
huang
|
5926b2fe81
|
dts测试
|
2015-07-19 20:39:53 +08:00 |
huang
|
c198a03a90
|
DTS测试工具
|
2015-07-19 20:08:57 +08:00 |
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
yutao
|
8d858cccfc
|
个人主页
|
2015-07-17 13:40:53 +08:00 |
yutao
|
87ab758ec5
|
个人主页->动态
|
2015-07-16 10:26:09 +08:00 |
sw
|
536a9d7b6b
|
修改表名
|
2015-07-15 15:28:44 +08:00 |
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
2015-07-15 15:21:26 +08:00 |
yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |
yutao
|
b7c4449f4b
|
个人主页
|
2015-07-13 16:44:53 +08:00 |
guange
|
3614c6ee9b
|
project同步
|
2015-07-12 15:56:15 +08:00 |
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
2015-07-10 15:42:53 +08:00 |
sw
|
11191f6743
|
与编程作业服务器联调
|
2015-07-09 15:50:04 +08:00 |
sw
|
24d6c8e17e
|
编程作业表增加question_id字段
|
2015-07-09 15:20:59 +08:00 |
sw
|
8f3ac85fec
|
1、作业描述、编程作业代码字段改为longtext
2、提交作业界面显示修改
3、编程作业不可以修改和删除control判断
|
2015-07-08 17:19:11 +08:00 |
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
2015-07-08 11:17:59 +08:00 |
sw
|
17a9a1023a
|
增加编程作业中教辅比例
|
2015-07-08 10:58:03 +08:00 |
lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看,
获取作业的匿评率
|
2015-07-07 17:18:29 +08:00 |
sw
|
08c9d5a498
|
迟交扣分记录
|
2015-07-02 16:16:29 +08:00 |
sw
|
976c4ddd19
|
增加迁移文件
|
2015-07-02 15:36:27 +08:00 |
sw
|
156f2f9a2e
|
部分评分数据重复
|
2015-06-30 14:30:11 +08:00 |
lizanle
|
2ba87477fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-26 09:18:39 +08:00 |
sw
|
358c344ca5
|
迁移文件错误
|
2015-06-19 16:10:49 +08:00 |
sw
|
044370b958
|
作品创建时间迁移
|
2015-06-19 14:21:36 +08:00 |
lizanle
|
96220a0147
|
schema.rb
|
2015-06-15 10:08:05 +08:00 |
sw
|
243fa0af89
|
admin用户能操作作业和作品
|
2015-06-04 17:24:50 +08:00 |
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +08:00 |
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
sw
|
c8128cffea
|
删除无效动态
|
2015-06-02 13:59:33 +08:00 |
sw
|
8d23815169
|
数据迁移不完整
|
2015-06-02 11:42:12 +08:00 |
sw
|
bdbcc52320
|
评分计算的数据迁移
|
2015-06-02 11:01:49 +08:00 |
sw
|
c1d753f634
|
数据迁移文件增加个人动态中的迁移
|
2015-06-02 10:09:05 +08:00 |
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
2015-06-02 09:33:34 +08:00 |
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
2015-05-29 16:12:50 +08:00 |
alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +08:00 |
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
2015-05-28 14:44:04 +08:00 |
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
2015-05-27 17:32:14 +08:00 |
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>
|
2015-05-27 17:01:52 +08:00 |
alanlong9278
|
a27b3e9dc6
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-25 23:22:11 +08:00 |
lizanle
|
42fab7c784
|
schema
|
2015-05-25 11:05:28 +08:00 |
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
2015-05-21 10:54:02 +08:00 |
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>
|
2015-05-20 17:42:26 +08:00 |
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
2015-05-19 14:25:10 +08:00 |
sw
|
dc1971f507
|
学生作品详细得分表,以及相关的关系
|
2015-05-19 11:18:19 +08:00 |
sw
|
08b469fa3c
|
学生作品匿评分配表
|
2015-05-19 10:56:41 +08:00 |
sw
|
3abfaed081
|
学生提交作品表,以及相关的关系
|
2015-05-19 10:36:30 +08:00 |
sw
|
bb3e0c4c7e
|
手动评分作业、编程作业相关表的添加以及关系的定义
|
2015-05-19 10:20:07 +08:00 |
sw
|
7bfd7755f7
|
增加手动评分相关表,以及关系的定义
|
2015-05-19 09:56:08 +08:00 |
sw
|
a43a6289e4
|
新的老师布置的作业表添加,以及相关关系定义
|
2015-05-19 09:49:26 +08:00 |
guange
|
907d89e1cc
|
merge
|
2015-05-15 13:39:26 +08:00 |
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
2015-05-14 21:40:34 +08:00 |
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
2015-05-13 16:22:44 +08:00 |
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示,查看历次作业成绩的下啦刷新显示api改动
|
2015-05-13 09:56:34 +08:00 |
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
2015-05-10 18:06:45 +08:00 |
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
2015-05-08 16:14:46 +08:00 |
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:37:52 +08:00 |
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 16:10:07 +08:00 |
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
2015-05-06 15:40:13 +08:00 |
sw
|
2ade53053b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-05 16:33:13 +08:00 |
sw
|
c60ea1db84
|
111
|
2015-05-05 16:33:01 +08:00 |
lizanle
|
71004e2f78
|
课程学生列表显示太慢,需要对表加索引
|
2015-05-05 10:58:37 +08:00 |
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 15:20:40 +08:00 |
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>
|
2015-05-04 14:58:11 +08:00 |
lizanle
|
2f4ac77838
|
schema
|
2015-04-30 09:25:16 +08:00 |
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
2015-04-28 10:33:15 +08:00 |
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
2015-04-23 17:43:10 +08:00 |
sw
|
92eabdbecd
|
修改作业历史数据的问题
|
2015-04-22 11:49:48 +08:00 |
sw
|
09c51d1a87
|
修改创建作业未启用匿评时,所有作业列表看不到
|
2015-04-22 11:44:52 +08:00 |
alanlong9278
|
945192f1d8
|
添加memcached配置
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-21 09:41:40 +08:00 |
lizanle
|
871623b7c8
|
commit
|
2015-04-16 11:14:12 +08:00 |
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
|
2015-04-16 10:26:03 +08:00 |
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
2015-04-16 09:49:03 +08:00 |
guange
|
11c1bbb525
|
解决打包时文件过多插库错误
|
2015-04-15 11:24:15 +08:00 |
lizanle
|
b13d30bf20
|
自动更改
|
2015-04-15 10:52:50 +08:00 |
huang
|
f528584345
|
添加迁移--项目类型默认值
|
2015-04-14 20:04:58 +08:00 |