 lizanle
|
70003a8d9c
|
课程大纲功能 弹出框样式问题
|
2015-10-30 10:19:57 +08:00 |
 cxt
|
c4816a0414
|
名字为空的用户创建博客时博客名称为登录名
|
2015-10-30 09:56:55 +08:00 |
 huang
|
286b1a1f0d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-10-29 17:31:03 +08:00 |
|
huang
|
b2f6d4f2bc
|
Merge branch 'szzh' into develop
|
2015-10-29 17:30:05 +08:00 |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 17:29:26 +08:00 |
|
huang
|
3db2e909b3
|
Merge branch 'gitlab_guange' into szzh
|
2015-10-29 17:29:03 +08:00 |
|
huang
|
57f37acecc
|
提交情况统计
提交接口修改
|
2015-10-29 17:28:23 +08:00 |
 ouyangxuhua
|
c8a28ef060
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 17:26:51 +08:00 |
|
ouyangxuhua
|
070166e7c7
|
搜索课程后，点击退出按钮，执行操作后，刷新当前页面，使退出变成加入。
|
2015-10-29 17:26:37 +08:00 |
|
lizanle
|
0815cde772
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-29 17:09:18 +08:00 |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
2015-10-29 17:09:03 +08:00 |
|
ouyangxuhua
|
16206d8c0a
|
隐藏课程的关闭/开启按钮
|
2015-10-29 16:48:54 +08:00 |
|
ouyangxuhua
|
1963434242
|
解决搜索课程后，点击加入按钮无反应的bug
|
2015-10-29 16:35:23 +08:00 |
|
huang
|
0158fe023d
|
修改 最近一次提交记录 接口
数据同步 validate类型控制
|
2015-10-29 15:56:41 +08:00 |
|
ouyangxuhua
|
f26707e381
|
增加课程成员，给该老师也发送消息；
修改增加成员或删除成员消息的内容
|
2015-10-29 15:38:57 +08:00 |
|
huang
|
331461465f
|
Merge branch 'szzh' into gitlab_guange
|
2015-10-29 14:20:41 +08:00 |
|
huang
|
df8d2f8dd4
|
gitlab调用commits接口
|
2015-10-29 14:20:23 +08:00 |
|
lizanle
|
a747983a51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 14:05:58 +08:00 |
|
huang
|
bf06a6cafd
|
解决数据同步问题（历史邮件通知validate问题）
|
2015-10-29 12:33:22 +08:00 |
|
lizanle
|
ac82910aa5
|
大纲
|
2015-10-29 11:53:52 +08:00 |
|
ouyangxuhua
|
eb24e1dbea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 10:50:32 +08:00 |
|
ouyangxuhua
|
e1a7ebd95f
|
增加创建课程消息提示内容
|
2015-10-29 10:50:19 +08:00 |
|
cxt
|
b0aee8c92f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 10:43:16 +08:00 |
|
cxt
|
958d781997
|
作品列表的样式修改
|
2015-10-29 10:43:01 +08:00 |
|
ouyangxuhua
|
b11aaa545a
|
老师将课程成员拉入或者移出项目时，给出相应的消息通知
|
2015-10-29 09:52:59 +08:00 |
|
ouyangxuhua
|
f8931ea78f
|
系统消息，将截止时间改成发布时间
|
2015-10-29 09:36:36 +08:00 |
|
ouyangxuhua
|
c3a67a544b
|
修改系统消息logo为红色trustie
|
2015-10-29 09:23:04 +08:00 |
|
ouyangxuhua
|
4f64859b14
|
没有关注的人，sql报错
|
2015-10-29 09:11:13 +08:00 |
|
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +08:00 |
|
lizanle
|
5b624330cf
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
public/stylesheets/courses.css
|
2015-10-29 09:04:59 +08:00 |
|
lizanle
|
0de97fb9ef
|
如果没有关注的人，sql会报错
|
2015-10-29 09:04:04 +08:00 |
|
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 17:37:41 +08:00 |
 Tim
|
1a2edd9103
|
课程大纲图标等修改
|
2015-10-28 17:34:41 +08:00 |
|
cxt
|
33501f0f69
|
隐藏课程搜索页面的“加入”按钮
|
2015-10-28 16:11:41 +08:00 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
|
Tim
|
510a1f5fdb
|
搜索按钮鼠标覆盖效果
|
2015-10-28 15:02:21 +08:00 |
|
Tim
|
c8d9ce81bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-28 14:59:03 +08:00 |
|
huang
|
5bcc9c21f2
|
修复课程成员不能编辑、删除、添加的问题
|
2015-10-28 14:57:10 +08:00 |
|
Tim
|
61dc979ee4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-28 14:53:39 +08:00 |
|
Tim
|
e58dcc851b
|
资源库搜索图标替换
|
2015-10-28 14:34:39 +08:00 |
|
cxt
|
4f8bea35f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-28 14:22:28 +08:00 |
|
cxt
|
d851364e70
|
匿评开启前学生能看到提交的作品数
|
2015-10-28 14:22:17 +08:00 |
|
lizanle
|
55e5826fef
|
回复的时候要更新activity的的更新时间
|
2015-10-28 11:13:59 +08:00 |
|
lizanle
|
76ac5a49f2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-28 10:58:46 +08:00 |
|
lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
2015-10-28 10:58:37 +08:00 |
|
cxt
|
bd350536eb
|
弹出“加入课程”对话框后隐藏"加入/新建课程"的菜单
|
2015-10-28 10:30:31 +08:00 |
|
cxt
|
86354028ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-28 10:18:02 +08:00 |
|
cxt
|
b1284cbf55
|
个人动态和课程动态中的作业添加配置菜单
|
2015-10-28 10:17:45 +08:00 |
|
huang
|
d9d536b961
|
Merge branch 'szzh' into develop
|
2015-10-28 09:29:38 +08:00 |
|
huang
|
1f759cbecd
|
Merge branch 'gitlab_guange' into szzh
|
2015-10-28 09:28:38 +08:00 |