 ouyangxuhua
|
96c4924c89
|
Merge branch 'ouyangxuhua' into szzh
|
2015-08-12 16:39:15 +08:00 |
|
ouyangxuhua
|
e5289410dd
|
项目搜索页码显示问题
|
2015-08-12 16:35:10 +08:00 |
|
ouyangxuhua
|
115e1e67d5
|
加入项目跳转至相应项目
|
2015-08-12 16:32:34 +08:00 |
|
ouyangxuhua
|
78ccfe6a03
|
添加关注
|
2015-08-12 16:28:21 +08:00 |
 sw
|
a240a2785f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-12 16:26:17 +08:00 |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
|
ouyangxuhua
|
d67d21eb42
|
1、解决项目搜素 分页异常问题
|
2015-08-12 11:28:51 +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 |
|
huang
|
6e5f6069bd
|
Merge branch 'szzh' into dev_hjq
|
2015-08-11 15:27:38 +08:00 |
|
huang
|
2d40c7a4d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-11 15:27:01 +08:00 |
|
huang
|
5f87d5806b
|
解决留言消息提示中遗留的bug
|
2015-08-11 15:26:41 +08:00 |
 lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
2015-08-11 15:00:40 +08:00 |
|
sw
|
a1dfe13728
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-11 14:53:59 +08:00 |
 cxt
|
a872692984
|
为activities表添加created_at字段，并导入数据
|
2015-08-11 14:49:32 +08:00 |
|
lizanle
|
477db5841b
|
没有选择导入问卷的时候提示
|
2015-08-11 14:32:01 +08:00 |
|
lizanle
|
51f71d1081
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-11 11:30:23 +08:00 |
|
lizanle
|
d43ded4f8b
|
1.没有可导入的问卷提示
2.教辅也可以导入老师的问卷
|
2015-08-11 11:30:17 +08:00 |
|
cxt
|
21f81a931a
|
修改个人主页的“新建课程”“新建项目”“加入课程””加入项目“的按钮样式
|
2015-08-11 11:26:22 +08:00 |
|
sw
|
733eeaf34f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-10 17:29:14 +08:00 |
|
huang
|
4589016027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-10 16:12:31 +08:00 |
|
huang
|
82747a7690
|
留言添加消息提示
|
2015-08-10 16:12:13 +08:00 |
|
lizanle
|
a282d81551
|
加入课程或者已经加入的课程，提示后进行跳转
|
2015-08-10 15:31:23 +08:00 |
|
sw
|
09b1c03ef2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-10 11:21:04 +08:00 |
|
lizanle
|
44f22feefd
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
2015-08-10 09:13:38 +08:00 |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-10 09:12:57 +08:00 |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
2015-08-10 09:12:26 +08:00 |
|
huang
|
bc6b6b0536
|
底部国际化
|
2015-08-04 18:24:06 +08:00 |
|
sw
|
e97cdf1b4f
|
Merge branch 'szzh' into develop
|
2015-08-04 18:21:47 +08:00 |
|
sw
|
77860ba81e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-04 18:21:08 +08:00 |
|
huang
|
a51b532a0b
|
个人主页CSS
|
2015-08-04 18:18:37 +08:00 |
|
sw
|
3d2a91c6be
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-04 18:15:42 +08:00 |
|
huang
|
7ff93753c6
|
css
|
2015-08-04 18:10:48 +08:00 |
|
sw
|
1b85946c3c
|
Merge branch 'szzh' into develop
|
2015-08-04 18:08:32 +08:00 |
|
sw
|
e4378f1c4b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-04 18:08:21 +08:00 |
|
sw
|
34260626c9
|
Merge branch 'szzh' into develop
|
2015-08-04 17:53:45 +08:00 |
|
sw
|
08c4df8570
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-04 17:53:30 +08:00 |
|
sw
|
bb8edad410
|
Merge branch 'develop' into szzh
|
2015-08-04 17:53:16 +08:00 |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
2015-08-04 17:52:57 +08:00 |
|
huang
|
69adc98fe4
|
个人主页左侧显示不正常
|
2015-08-04 17:26:03 +08:00 |
|
huang
|
f16d269101
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-04 17:06:41 +08:00 |
|
huang
|
ba84e19048
|
修正底部问题
|
2015-08-04 17:06:19 +08:00 |
|
sw
|
f3e9d6248d
|
Merge branch 'szzh' into develop
|
2015-08-04 16:43:08 +08:00 |
|
sw
|
f482d64a72
|
编译错误才存储错误信息
|
2015-08-04 16:42:17 +08:00 |
|
sw
|
96420f59a8
|
修改标准代码
|
2015-08-04 16:35:02 +08:00 |
|
sw
|
a7716ed4cb
|
编译错误才存储错误信息
|
2015-08-04 16:16:42 +08:00 |
|
sw
|
0099c99829
|
增加错误信息的存储
|
2015-08-04 16:14:47 +08:00 |
|
sw
|
6c10959cca
|
老师布置作业界面，标准代码宽度调整
|
2015-08-04 16:03:17 +08:00 |