 lizanle
|
78ebeaee3b
|
批量删除提示修改
|
2015-11-13 15:38:16 +08:00 |
|
lizanle
|
465bc9bd6c
|
新增和删除的时候数据联动bug
|
2015-11-13 15:04:50 +08:00 |
 ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
2015-11-13 15:02:12 +08:00 |
|
lizanle
|
28a6e09edd
|
资源批量删除情况
|
2015-11-13 14:56:18 +08:00 |
|
lizanle
|
e7d53f5e16
|
课程资源上传允许多选tag
|
2015-11-13 11:17:47 +08:00 |
|
ouyangxuhua
|
ef1bc8aea7
|
组织用户不能为空提示
|
2015-11-13 10:15:39 +08:00 |
|
ouyangxuhua
|
5aea2250c4
|
组织加入成员时，如果没有选择用户，弹窗给出提示
|
2015-11-13 10:14:38 +08:00 |
|
ouyangxuhua
|
2a5eeaa527
|
在组织页面左边，增加项目名称一栏
|
2015-11-13 09:13:57 +08:00 |
|
ouyangxuhua
|
eb64fa7642
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-11-13 08:45:41 +08:00 |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
2015-11-12 20:57:41 +08:00 |
|
lizanle
|
b3a234cfc6
|
编辑的时候也需要对文章名字限制长度
|
2015-11-12 19:56:39 +08:00 |
|
lizanle
|
99637924b4
|
文章标题限制长度
|
2015-11-12 19:52:46 +08:00 |
|
lizanle
|
e265047ba9
|
搜索成员翻页靠右
|
2015-11-12 19:37:28 +08:00 |
|
lizanle
|
f1b61c1581
|
搜索翻页后将丢失数据
|
2015-11-12 19:32:15 +08:00 |
|
lizanle
|
df0051cdd4
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:26:39 +08:00 |
|
lizanle
|
c2e783d78b
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:19:01 +08:00 |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
2015-11-12 19:15:35 +08:00 |
|
lizanle
|
6fd76eb622
|
删除成员要做确认
|
2015-11-12 19:02:00 +08:00 |
|
lizanle
|
368d755499
|
改为管理人员
|
2015-11-12 18:41:10 +08:00 |
 cxt
|
2c5cd1a4b3
|
编辑作业页面添加截止日期和发布日期label
|
2015-11-12 18:14:56 +08:00 |
|
ouyangxuhua
|
7dc02d2c4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/organizations/_show_org_document.html.erb
|
2015-11-12 18:00:25 +08:00 |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
2015-11-12 17:52:47 +08:00 |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-12 17:20:11 +08:00 |
 Tim
|
7751dc9081
|
组织页面调整
|
2015-11-12 17:00:35 +08:00 |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
lizanle
|
6b7dd81509
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-12 16:35:30 +08:00 |
|
lizanle
|
506709b474
|
个人资源库，课程 资源文件上传
1.单个上传
2.给出明确的提示
3.按钮联动
|
2015-11-12 16:35:13 +08:00 |
|
Tim
|
1a1dc7bacc
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-12 15:32:36 +08:00 |
|
Tim
|
b52f4f80c4
|
迁移自动生成文件
|
2015-11-12 15:31:47 +08:00 |
|
ouyangxuhua
|
bf01994e4f
|
修改组织文章显示样式
|
2015-11-12 15:12:23 +08:00 |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
2015-11-12 14:55:31 +08:00 |
|
cxt
|
3f60893591
|
禁用匿评的作业在截止时作业状态变为3
|
2015-11-12 14:53:12 +08:00 |
|
cxt
|
8fa790dd6b
|
作品列表的文字调整
|
2015-11-12 11:48:27 +08:00 |
|
cxt
|
41751f08ba
|
学生作品列表右上角的编辑和删除icon增加tip，两个icon的距离增加
|
2015-11-12 11:31:35 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
|
Tim
|
aed305f5bf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 17:16:37 +08:00 |
|
Tim
|
7dd299255b
|
博客页面微调
|
2015-11-11 17:16:19 +08:00 |
 huang
|
9b2ccca649
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 16:40:38 +08:00 |
|
huang
|
e4daad95b7
|
Merge branch 'develop' into szzh
|
2015-11-11 16:40:23 +08:00 |
|
huang
|
2596f0a788
|
优化权限代码
|
2015-11-11 16:39:05 +08:00 |
|
cxt
|
70ce172b88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 16:33:31 +08:00 |
|
huang
|
3aa73fba35
|
Gitlab权限修改
更新项目Gitlab同步更新
|
2015-11-11 16:33:09 +08:00 |
|
lizanle
|
84348d15ea
|
文件上传的 确定按钮的联动 作业提交回退
|
2015-11-11 16:32:13 +08:00 |
|
cxt
|
62cd410e1e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 16:16:22 +08:00 |
|
lizanle
|
4b26af8920
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-11 16:03:00 +08:00 |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
2015-11-11 16:02:37 +08:00 |
|
Tim
|
465c5958f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-11 15:36:06 +08:00 |
|
Tim
|
b8999e1c6e
|
博客标题输入框宽度调整
|
2015-11-11 15:35:47 +08:00 |
|
huang
|
16c31e254e
|
区分Gitlab公开项目和私有项目
|
2015-11-11 15:33:43 +08:00 |
|
huang
|
7318b172ee
|
Merge branch 'szzh' into develop
|
2015-11-11 12:44:50 +08:00 |