 ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
|
ouyangxuhua
|
8ead573872
|
组织设置url
|
2016-01-13 09:56:24 +08:00 |
|
ouyangxuhua
|
5d9ce929d9
|
组织栏目子目录
|
2016-01-13 09:34:33 +08:00 |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +08:00 |
 huang
|
83881766b2
|
提交总数接口获取修改
|
2016-01-12 11:01:58 +08:00 |
|
huang
|
500527a12d
|
gitlab同步问题
|
2016-01-12 10:42:25 +08:00 |
|
ouyangxuhua
|
48f931deba
|
隐藏组织的课程/项目快捷菜单
|
2016-01-11 17:02:01 +08:00 |
|
ouyangxuhua
|
2f5ada2d7b
|
博客设为首页后，显示在个人主页处
|
2016-01-11 16:56:57 +08:00 |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +08:00 |
|
huang
|
525d1544c2
|
代码样式
|
2016-01-11 10:43:48 +08:00 |
|
huang
|
4e25b9730f
|
Merge branch 'szzh' into develop
|
2016-01-08 23:03:39 +08:00 |
 guange
|
d4d1fe65b3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 23:01:33 +08:00 |
|
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
2016-01-08 23:01:16 +08:00 |
|
huang
|
100ecfb184
|
Merge branch 'szzh' into develop
|
2016-01-08 22:31:29 +08:00 |
|
huang
|
28c3dca099
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 22:30:48 +08:00 |
|
huang
|
df16b9b22d
|
Merge branch 'develop' into szzh
|
2016-01-08 22:30:39 +08:00 |
 cxt
|
66c3cee3f8
|
课程关联组织列表
|
2016-01-08 22:30:04 +08:00 |
|
huang
|
c719fd96a3
|
0
|
2016-01-08 22:29:57 +08:00 |
|
cxt
|
bb0a03b309
|
若无任何个人留言，或者当前用户无权限看到任何个人留言，不要显示白框
|
2016-01-08 22:02:35 +08:00 |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
2016-01-08 21:47:42 +08:00 |
|
cxt
|
a3370b693c
|
课程关联组织列表为空
|
2016-01-08 21:46:10 +08:00 |
|
huang
|
5d68d185d5
|
资源样式冲突
|
2016-01-08 21:24:25 +08:00 |
|
cxt
|
eab8cc7231
|
复制学期的默认图片
|
2016-01-08 21:22:36 +08:00 |
|
huang
|
f9bc1efd7c
|
issue编辑的时候ajax刷新附件
|
2016-01-08 21:18:08 +08:00 |
|
huang
|
3df542ff6a
|
Merge branch 'szzh' into develop
|
2016-01-08 20:46:06 +08:00 |
|
cxt
|
ff42d584ef
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:45:06 +08:00 |
|
cxt
|
a206a1d7f1
|
样式
|
2016-01-08 20:43:33 +08:00 |
|
cxt
|
6c4dbb9ba0
|
Merge branch 'szzh' into cxt_course
|
2016-01-08 20:38:02 +08:00 |
|
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 20:36:08 +08:00 |
|
cxt
|
1264d5f6ca
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 20:35:19 +08:00 |
|
cxt
|
9368e3875c
|
去掉关联项目的提交次数
|
2016-01-08 20:35:05 +08:00 |
|
cxt
|
75e2eecc37
|
课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通
|
2016-01-08 20:23:27 +08:00 |
|
huang
|
64889fd14a
|
项目资源提供新分页
|
2016-01-08 20:10:43 +08:00 |
|
ouyangxuhua
|
5d819625c0
|
快捷菜单上传文件使用最新的上传方式
|
2016-01-08 20:09:57 +08:00 |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
2016-01-08 19:50:17 +08:00 |
|
cxt
|
ef441d3bca
|
关联项目样式修改
|
2016-01-08 19:43:37 +08:00 |
|
ouyangxuhua
|
3a62db6475
|
Merge branch 'dev_hjq' into szzh
|
2016-01-08 19:34:36 +08:00 |
|
ouyangxuhua
|
ceeec3af12
|
修改一些bug
|
2016-01-08 19:33:58 +08:00 |
|
cxt
|
7c376ed60b
|
数据迁移
|
2016-01-08 19:15:47 +08:00 |
|
cxt
|
cf61fd6b85
|
Merge branch 'develop' into szzh
|
2016-01-08 19:09:18 +08:00 |
|
cxt
|
5dbad5a672
|
已关联项目的样式修改
|
2016-01-08 19:04:22 +08:00 |
|
huang
|
580e4d7327
|
迁移问题
|
2016-01-08 18:55:17 +08:00 |
|
huang
|
d7994c42c1
|
Merge branch 'szzh' into develop
|
2016-01-08 18:12:18 +08:00 |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
|
huang
|
5079113f73
|
Merge branch 'hjq_new_course' into szzh
|
2016-01-08 18:10:38 +08:00 |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-08 18:09:21 +08:00 |
|
huang
|
762ebb150b
|
解决课程资源重复分页问题
|
2016-01-08 18:09:11 +08:00 |
|
cxt
|
90f6f07f19
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 18:06:28 +08:00 |
|
cxt
|
6d97673181
|
Merge branch 'cxt_course' into szzh
|
2016-01-08 18:06:18 +08:00 |
|
huang
|
0ab500986a
|
发送搜索功能
|
2016-01-08 18:03:59 +08:00 |