 huang
|
05bb40c8a7
|
Merge branch 'develop' into gitlab_guange
|
2015-11-02 13:58:09 +08:00 |
|
huang
|
af37dac432
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-02 13:53:54 +08:00 |
|
huang
|
8ec2dc3196
|
多版本库情况：
1、没有新增项目提供接口
2、新建页面历史版本库列表
|
2015-11-02 13:53:35 +08:00 |
 lizanle
|
b762a639ea
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 13:47:25 +08:00 |
|
lizanle
|
bd5a316842
|
反馈框 信息修改
|
2015-11-02 13:47:18 +08:00 |
 ouyangxuhua
|
4dcbe18027
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 13:12:21 +08:00 |
|
ouyangxuhua
|
583b92a842
|
课程添加或者删除成员时，实时更新课程成员数量。
|
2015-11-02 13:12:03 +08:00 |
|
ouyangxuhua
|
fb692fad4c
|
在项目设置中，添加或删除成员时，实时更新项目成员数量。
|
2015-11-02 12:54:58 +08:00 |
|
lizanle
|
8846e2ff67
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 10:37:51 +08:00 |
|
lizanle
|
0aa2aefe03
|
修改用户名密码不可用
|
2015-11-02 10:30:51 +08:00 |
 cxt
|
a2e2c5de3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-02 10:14:18 +08:00 |
|
lizanle
|
6fffcec250
|
如果没有填写真实名字的话，那么就要用用户名了。
|
2015-11-02 10:10:32 +08:00 |
|
cxt
|
6e7a6909d6
|
作业动态中的未发布作业显示发布时间
|
2015-11-02 10:02:02 +08:00 |
|
lizanle
|
6288151f40
|
qq群加入链接问题
|
2015-11-02 09:49:21 +08:00 |
|
lizanle
|
7df2a632fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-02 09:35:41 +08:00 |
|
lizanle
|
681f33ee2c
|
取消大纲 提示
|
2015-11-02 09:35:13 +08:00 |
|
huang
|
066d04016e
|
去掉重复“提交代码”
|
2015-11-02 08:39:17 +08:00 |
|
cxt
|
0fb48a41cb
|
课程搜索页面的加入按钮
|
2015-10-30 19:03:49 +08:00 |
|
lizanle
|
4b9a60658f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 17:51:20 +08:00 |
|
lizanle
|
7962bdf5a2
|
outline
after keyboard enter
_course_outline_list cannot disppear
|
2015-10-30 17:51:12 +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 |
|
lizanle
|
732e4e1017
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:32:50 +08:00 |
|
lizanle
|
19f3172966
|
user_message
enter course message ,username need to be realname
|
2015-10-30 17:28:35 +08:00 |
|
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
lizanle
|
efef1d943f
|
outline bug
|
2015-10-30 17:13:06 +08:00 |
|
lizanle
|
bab616060b
|
答疑群
|
2015-10-30 16:55:55 +08:00 |
|
huang
|
e41a53cb8f
|
Merge branch 'szzh' into develop
|
2015-10-30 16:51:46 +08:00 |
|
lizanle
|
a08be355ae
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 15:56:19 +08:00 |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
2015-10-30 15:55:48 +08:00 |
|
huang
|
aa4710d872
|
git中忽略配置文件
提交记录新界面
修改获取用户路径
|
2015-10-30 15:46:06 +08:00 |
|
lizanle
|
af14861b96
|
取消大纲
|
2015-10-30 14:26:50 +08:00 |
|
lizanle
|
b97ad10cc9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-30 14:10:19 +08:00 |
|
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
2015-10-30 14:10:08 +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
|
8dc730cd3e
|
大纲回复框改变
|
2015-10-30 11:31:42 +08:00 |
|
lizanle
|
a27c359df4
|
大纲设置的图标改动
|
2015-10-30 10:52:34 +08:00 |
|
lizanle
|
4766cff41d
|
不符合条件的输入的时候，不显示结果
|
2015-10-30 10:46:51 +08:00 |
|
lizanle
|
bc7ce290a2
|
没有选中任何大纲不能提交
|
2015-10-30 10:43:35 +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
|
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 |
|
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
|
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 |
|
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
|
e1a7ebd95f
|
增加创建课程消息提示内容
|
2015-10-29 10:50:19 +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 |
|
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +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 |
|
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
|
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
|
211b5c2db9
|
Merge branch 'szzh' into gitlab_guange
|
2015-10-28 09:27:52 +08:00 |
|
huang
|
87b1790f04
|
未完成功能JS提示
|
2015-10-28 09:23:12 +08:00 |
|
huang
|
00ce480d52
|
查看文件，强制不换行
鼠标光标游走屏幕跟走效果
|
2015-10-27 17:26:43 +08:00 |
|
huang
|
2cf1f05022
|
修改目录结构
|
2015-10-27 16:32:25 +08:00 |
|
ouyangxuhua
|
ad3b9b68e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-27 15:32:50 +08:00 |
|
ouyangxuhua
|
8e38fa65aa
|
1.解决“搜索课程--加入课程：输入正确的课程密码，点击确认按钮无反应”的bug
|
2015-10-27 15:32:38 +08:00 |
|
huang
|
294a517251
|
查看所有提交记录入口
点击自动复制版本库地址
|
2015-10-27 15:27:12 +08:00 |
|
lizanle
|
21a7babfad
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-27 15:17:48 +08:00 |
|
lizanle
|
a0683d4900
|
加入课程界面输入框没有对齐
博客关注粉丝文字也要加超链接
|
2015-10-27 15:17:40 +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 |
|
huang
|
c04cae54fd
|
最近一次提交信息
|
2015-10-27 14:32:51 +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 |
|
huang
|
7970a46469
|
1、添加功能：依据分支切换显示不同的提交记录
2、切换分支刷新页面
3、版本库显示页面修稿
|
2015-10-27 11:41:25 +08:00 |
|
ouyangxuhua
|
268575ceec
|
加入课程申请样式调整
|
2015-10-27 11:01:06 +08:00 |
|
cxt
|
afd02d90a5
|
学生提交作品的作业信息页面显示作业附件
|
2015-10-27 09:58:19 +08:00 |
|
cxt
|
7c34927b3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-27 09:45:33 +08:00 |
|
cxt
|
25d6ed520e
|
首页的问题动态增加附件上传时间
|
2015-10-27 09:45:22 +08:00 |
|
lizanle
|
4c4f9ce10f
|
取消按钮变灰色
|
2015-10-27 09:39:02 +08:00 |
|
ouyangxuhua
|
f5a498a595
|
1.加入课程申请发送邮件；
2.解决360浏览器不能正确显示“重新评阅了作品”消息的问题
|
2015-10-27 09:29:54 +08:00 |
|
ouyangxuhua
|
fc70c8bfab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-26 17:25:07 +08:00 |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
2015-10-26 17:24:32 +08:00 |
|
huang
|
34a8d0890c
|
相政新界面
|
2015-10-26 17:18:59 +08:00 |
|
cxt
|
aa5bda8884
|
首页中的作业动态增加附件的显示
|
2015-10-26 15:54:08 +08:00 |
|
cxt
|
2f4b29085c
|
首页动态中的表格超出边框
|
2015-10-26 15:26:05 +08:00 |
|
cxt
|
5f5a235e4b
|
点击加入课程后首页样式发生变化
|
2015-10-26 14:35:42 +08:00 |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
2015-10-26 14:15:23 +08:00 |
|
cxt
|
efe4b8609f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-26 11:55:52 +08:00 |
|
cxt
|
2824b56481
|
增加首页教师加入课程的入口
|
2015-10-26 11:54:59 +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 |
|
lizanle
|
3b5b203b2e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-24 16:16:11 +08:00 |