 sw
|
044370b958
|
作品创建时间迁移
|
2015-06-19 14:21:36 +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 |