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 |
sw
|
9da18bcad4
|
老师测试结果的返回
|
2015-07-31 13:58:27 +08:00 |