 yuanke
|
04e9551450
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-26 08:52:52 +08:00 |
 daiao
|
67bdea314a
|
作品列表-分班过滤：点击“请选择分班”过滤显示所有学生
|
2016-07-25 19:53:56 +08:00 |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
2016-07-25 18:54:44 +08:00 |
|
daiao
|
a7b758a417
|
Merge branch 'develop' into daiao_dev
|
2016-07-25 18:41:57 +08:00 |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
2016-07-25 18:31:28 +08:00 |
 guange
|
652e56dec4
|
忽略wechat.yml
|
2016-07-25 18:16:47 +08:00 |
|
guange
|
6a871e2116
|
.
|
2016-07-25 17:09:14 +08:00 |
|
yuanke
|
4f803ce0de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-25 17:02:52 +08:00 |
|
yuanke
|
db7c267a47
|
微信单个项目动态
|
2016-07-25 17:02:42 +08:00 |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
2016-07-25 16:59:52 +08:00 |
|
guange
|
5bd3e98f56
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-25 15:36:46 +08:00 |
|
guange
|
fb91309646
|
merge
|
2016-07-25 15:36:29 +08:00 |
 txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
2016-07-25 15:31:44 +08:00 |
|
guange
|
e31fbe9b50
|
解决task报错，找不到uglifier的问题
|
2016-07-25 15:29:47 +08:00 |
 huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
2016-07-25 15:22:34 +08:00 |
|
yuanke
|
b9b9a867f4
|
项目
|
2016-07-25 15:20:01 +08:00 |
 cxt
|
1e0ed2bfba
|
新建课程和班级时的占位符需要更改
|
2016-07-25 14:54:57 +08:00 |
|
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
2016-07-25 14:49:08 +08:00 |
|
huang
|
84d1adbf25
|
生成邀请码
|
2016-07-25 14:36:52 +08:00 |
|
huang
|
920a599417
|
Merge branch 'develop' into rep_quality
|
2016-07-25 14:11:04 +08:00 |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-25 14:10:48 +08:00 |
|
huang
|
be88914e39
|
去掉id转换用户名
|
2016-07-25 13:59:10 +08:00 |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
2016-07-25 13:56:26 +08:00 |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
2016-07-25 10:59:08 +08:00 |
|
daiao
|
72c23b4a72
|
Merge branch 'daiao_dev' into develop
|
2016-07-25 10:04:59 +08:00 |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
2016-07-25 10:03:50 +08:00 |
|
cxt
|
df80362899
|
增加空格
|
2016-07-25 09:58:17 +08:00 |
|
huang
|
3210204395
|
Merge branch 'develop' into rep_quality
|
2016-07-25 09:48:05 +08:00 |
|
huang
|
1320097bf9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-25 09:47:37 +08:00 |
|
huang
|
43c6301223
|
id转换成用户名
|
2016-07-25 09:47:14 +08:00 |
|
cxt
|
11c9fba7e7
|
提示信息修改
|
2016-07-22 18:58:41 +08:00 |
|
cxt
|
dc9c0f924b
|
教师列表和学生列表的样式
|
2016-07-22 18:39:50 +08:00 |
|
cxt
|
48d5b89338
|
课程推荐为0的不显示
|
2016-07-22 18:26:48 +08:00 |
|
huang
|
190ef75200
|
Merge branch 'develop' into rep_quality
|
2016-07-22 18:26:12 +08:00 |
|
huang
|
ab4d85dcb7
|
组织500问题
|
2016-07-22 18:21:27 +08:00 |
|
cxt
|
60fe1854cd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-22 18:20:48 +08:00 |
|
cxt
|
6fdab3c613
|
Merge branch 'cxt_course' into develop
|
2016-07-22 18:20:41 +08:00 |
|
cxt
|
6c7925a7b4
|
样式调整
|
2016-07-22 18:20:11 +08:00 |
|
huang
|
9b97f7e472
|
解决用户主页关注和粉丝问题
|
2016-07-22 17:58:01 +08:00 |
|
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
2016-07-22 17:14:28 +08:00 |
|
cxt
|
6d4835c6cc
|
样式调整
|
2016-07-22 17:13:40 +08:00 |
|
huang
|
b71a19d53e
|
Gemfile还原
|
2016-07-22 16:55:10 +08:00 |
|
cxt
|
808b553e43
|
班级动态只有10条，底部却显示“点击展开更多”
|
2016-07-22 16:50:32 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
txz
|
216d590140
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-22 16:44:20 +08:00 |
|
txz
|
c4f4908c62
|
资源tab定位
|
2016-07-22 16:44:16 +08:00 |
|
huang
|
4d79f93079
|
Merge branch 'cs_optimize_txz' into develop
|
2016-07-22 16:43:17 +08:00 |
|
yuanke
|
cedd7ae520
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-22 16:42:47 +08:00 |
|
yuanke
|
37a6adf428
|
二级回复代码统一写到comment_reply里面
|
2016-07-22 16:42:34 +08:00 |
|
cxt
|
27fa113de1
|
组织动态报500
|
2016-07-22 16:40:28 +08:00 |