 huang
|
cb51545a31
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 18:03:01 +08:00 |
|
huang
|
29d950c187
|
Merge branch 'gitlab_guange' into develop
|
2015-11-27 18:01:59 +08:00 |
|
huang
|
aefab8abf3
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 18:01:28 +08:00 |
|
huang
|
c5ebfeb29c
|
Merge branch 'develop' into gitlab_guange
|
2015-11-27 18:00:57 +08:00 |
|
huang
|
f91918145d
|
0
|
2015-11-27 18:00:26 +08:00 |
Gan Yi.ang
|
e9caf0980a
|
同步用户sync_gitlab_user，加异常处理
|
2015-11-27 17:57:43 +08:00 |
 cxt
|
b616612032
|
测验取消按钮的还原功能暂时隐藏
|
2015-11-27 17:57:17 +08:00 |
 ouyangxuhua
|
00ac79bb34
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-27 17:28:20 +08:00 |
|
ouyangxuhua
|
879dee0cd6
|
关闭组织关联项目或课程弹窗，刷新整个页面。
|
2015-11-27 17:27:55 +08:00 |
|
cxt
|
6981de6753
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 17:20:54 +08:00 |
|
huang
|
45b94bd22d
|
Merge branch 'szzh' into develop
|
2015-11-27 17:19:32 +08:00 |
|
cxt
|
a76095fc5f
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 17:19:16 +08:00 |
|
cxt
|
d992809623
|
迁移
|
2015-11-27 17:19:05 +08:00 |
|
huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-27 17:18:31 +08:00 |
|
huang
|
5a5fe99019
|
Merge branch 'sw_new_course' into szzh
|
2015-11-27 17:17:52 +08:00 |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
2015-11-27 17:17:21 +08:00 |
|
huang
|
634e11d0ec
|
0
|
2015-11-27 17:15:51 +08:00 |
 lizanle
|
cb910b8d4a
|
系统消息添加logo
|
2015-11-27 17:02:37 +08:00 |
|
huang
|
b130b52a23
|
修改迁移
|
2015-11-27 16:55:45 +08:00 |
 Tim
|
06ca4c8f4b
|
作品列表样式调整
|
2015-11-27 16:52:28 +08:00 |
|
ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
2015-11-27 16:28:16 +08:00 |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
2015-11-27 16:27:23 +08:00 |
|
Tim
|
580cc6b8d8
|
系统自动生成文件
|
2015-11-27 16:14:42 +08:00 |
|
huang
|
ee7fb11acc
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 16:01:03 +08:00 |
|
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
2015-11-27 16:00:43 +08:00 |
|
ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
2015-11-27 15:25:49 +08:00 |
|
Gan Yi.ang
|
79656aa205
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 15:22:18 +08:00 |
|
Gan Yi.ang
|
c3a27151ca
|
修复_revision
|
2015-11-27 15:21:58 +08:00 |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
|
lizanle
|
e710f443c2
|
全站搜索
|
2015-11-27 15:17:17 +08:00 |
|
huang
|
eb84434b50
|
Merge branch 'szzh' into develop
|
2015-11-27 14:57:32 +08:00 |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +08:00 |
|
huang
|
959be1ccd9
|
Merge branch 'gitlab_guange' into szzh
|
2015-11-27 14:50:17 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
huang
|
d59c7608cd
|
Merge branch 'hjq_new_course' into szzh
|
2015-11-27 14:47:42 +08:00 |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
|
ouyangxuhua
|
25b66b5dbb
|
取消弹窗
|
2015-11-27 14:43:08 +08:00 |
|
lizanle
|
3d9f632105
|
全站搜索
|
2015-11-27 14:42:25 +08:00 |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
|
ouyangxuhua
|
365349878d
|
组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示
|
2015-11-27 13:17:23 +08:00 |
|
lizanle
|
c28b8bab14
|
全站搜索
|
2015-11-27 13:09:20 +08:00 |
|
lizanle
|
0992ddd0f6
|
全站搜索
|
2015-11-27 13:07:25 +08:00 |
|
lizanle
|
bf1c1cf0a1
|
全站搜索
|
2015-11-27 13:07:09 +08:00 |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
2015-11-27 12:34:02 +08:00 |
|
lizanle
|
6be917e052
|
全站搜索
|
2015-11-27 11:34:42 +08:00 |
|
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 11:27:03 +08:00 |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
2015-11-27 11:25:16 +08:00 |
|
lizanle
|
768aff89da
|
全站搜索
|
2015-11-27 11:09:01 +08:00 |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
2015-11-27 11:02:48 +08:00 |