 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 |
 Tim
|
1a2edd9103
|
课程大纲图标等修改
|
2015-10-28 17:34:41 +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
|
1f759cbecd
|
Merge branch 'gitlab_guange' into szzh
|
2015-10-28 09:28:38 +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 |
|
huang
|
0a823c7289
|
Merge branch 'szzh' into develop
|
2015-10-27 14:35:01 +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
|
80ec5b0b50
|
合并出错
|
2015-10-27 14:30:25 +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
|
242b7bc998
|
undo redo的改变个数改为1
|
2015-10-27 10:29:57 +08:00 |
|
cxt
|
afd02d90a5
|
学生提交作品的作业信息页面显示作业附件
|
2015-10-27 09:58:19 +08:00 |
|
lizanle
|
0cad264620
|
elsif写错了
|
2015-10-27 09:46:25 +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 |
|
lizanle
|
6c5c7988dc
|
博客删除报错的问题
|
2015-10-26 17:20:15 +08:00 |
|
huang
|
34a8d0890c
|
相政新界面
|
2015-10-26 17:18:59 +08:00 |