 guange
|
fa0332babd
|
只有在同步项目时才同步用户
|
2015-11-01 22:25:42 +08:00 |
 huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:47:04 +08:00 |
|
huang
|
2b89244f52
|
修改用户url问题
解决urlhttp重复问题
|
2015-10-30 17:45:44 +08:00 |
 cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-30 17:24:26 +08:00 |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
2015-10-30 17:24:09 +08:00 |
 lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
2015-10-30 16:26:51 +08:00 |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
2015-10-30 15:55:48 +08:00 |
|
lizanle
|
8531ab51ab
|
取消大纲不删除博客
|
2015-10-30 14:22:11 +08:00 |
|
cxt
|
f5aaf7ac58
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-10-30 13:59:33 +08:00 |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
2015-10-30 13:58:54 +08:00 |
|
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
2015-10-30 11:51:09 +08:00 |
|
lizanle
|
00157b4302
|
大纲设置的图标改动 ，添加删除动作
|
2015-10-30 10:52:56 +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
|
57f37acecc
|
提交情况统计
提交接口修改
|
2015-10-29 17:28:23 +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 |
|
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 |
|
lizanle
|
ac82910aa5
|
大纲
|
2015-10-29 11:53:52 +08:00 |
|
ouyangxuhua
|
b11aaa545a
|
老师将课程成员拉入或者移出项目时，给出相应的消息通知
|
2015-10-29 09:52:59 +08:00 |
|
ouyangxuhua
|
4f64859b14
|
没有关注的人，sql报错
|
2015-10-29 09:11:13 +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 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +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
|
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
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
|
ouyangxuhua
|
e13d157f7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-27 14:33:09 +08:00 |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
2015-10-27 14:08:08 +08:00 |
|
guange
|
9303dfd5ae
|
IE下载xls乱码问题
|
2015-10-27 12:04:52 +08:00 |
|
huang
|
7970a46469
|
1、添加功能：依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
2015-10-27 11:41:25 +08:00 |
|
ouyangxuhua
|
268575ceec
|
加入课程申请样式调整
|
2015-10-27 11:01:06 +08:00 |
|
lizanle
|
0cad264620
|
elsif写错了
|
2015-10-27 09:46:25 +08:00 |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
2015-10-26 17:24:32 +08:00 |
|
lizanle
|
6c5c7988dc
|
博客删除报错的问题
|
2015-10-26 17:20:15 +08:00 |
|
huang
|
34a8d0890c
|
相政新界面
|
2015-10-26 17:18:59 +08:00 |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
2015-10-26 14:15:23 +08:00 |
|
ouyangxuhua
|
d509ef01e8
|
更新用户申请加入项目以及反馈的消息的状态
|
2015-10-26 13:26:49 +08:00 |
|
lizanle
|
69bc26033e
|
防止url删减报错
url博客内容长度限制改为20000
|
2015-10-26 10:54:27 +08:00 |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
|
ouyangxuhua
|
586cde6f87
|
更新用户申请成为课程的老师或教辅消息的状态
|
2015-10-26 09:04:09 +08:00 |