 huang
|
d0a8b4bc18
|
项目资源云搜索
|
2016-01-06 18:07:35 +08:00 |
 ouyangxuhua
|
eacf89100d
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
config/routes.rb
db/schema.rb
public/images/hwork_icon.png
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-06 16:27:42 +08:00 |
|
huang
|
b4617e431f
|
代码格式
|
2016-01-06 16:22:25 +08:00 |
|
ouyangxuhua
|
7d4e3cdd5c
|
1.增加项目/课程快捷功能；
2.增加私信功能
|
2016-01-06 16:22:13 +08:00 |
|
huang
|
9464495c19
|
资源搜索
资源公开私有ajax
|
2016-01-06 15:58:22 +08:00 |
|
huang
|
c4718f992c
|
项目资源搜索
|
2016-01-06 11:05:52 +08:00 |
 Tim
|
e9d986b311
|
课程关联项目样式调整
|
2016-01-06 11:01:00 +08:00 |
 cxt
|
cf125159f2
|
关联项目增加提交次数
|
2016-01-06 10:36:53 +08:00 |
|
Tim
|
17800e8cf2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-06 10:36:28 +08:00 |
|
cxt
|
d4d96e66fc
|
Merge branch 'develop' into cxt_course
|
2016-01-06 10:03:21 +08:00 |
|
cxt
|
0606584edf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-06 09:59:56 +08:00 |
|
cxt
|
50a1344aa3
|
Merge branch 'szzh' into develop
|
2016-01-06 09:59:48 +08:00 |
|
cxt
|
244e133803
|
关联项目的对齐
|
2016-01-06 09:57:54 +08:00 |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-06 09:27:00 +08:00 |
|
huang
|
cf32085564
|
Merge branch 'szzh' into develop
|
2016-01-05 17:03:51 +08:00 |
|
huang
|
7ee4ff69b3
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
2016-01-05 17:03:10 +08:00 |
|
huang
|
f81eea54b1
|
Merge branch 'develop' into szzh
|
2016-01-05 17:02:06 +08:00 |
|
huang
|
fc55be78c6
|
博客列表展开/
|
2016-01-05 17:01:41 +08:00 |
|
ouyangxuhua
|
a81eb5cbc8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-05 16:55:38 +08:00 |
|
ouyangxuhua
|
dab3f0d225
|
为组织1添加子域名：team
|
2016-01-05 16:55:21 +08:00 |
|
huang
|
738acad211
|
展开、收缩
|
2016-01-05 16:52:34 +08:00 |
|
cxt
|
9ccca401f6
|
匿评时也显示系统测试情况
|
2016-01-05 16:47:55 +08:00 |
|
ouyangxuhua
|
d8c6775f42
|
1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题；
2.组织申请子域名功能。
|
2016-01-05 16:46:06 +08:00 |
|
huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
2016-01-05 16:05:27 +08:00 |
|
huang
|
dc77eb6ef6
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-05 15:59:30 +08:00 |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
2016-01-05 15:59:13 +08:00 |
|
cxt
|
2b2abd912d
|
Merge branch 'szzh' into cxt_course
|
2016-01-05 15:50:11 +08:00 |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
2016-01-05 15:46:41 +08:00 |
|
cxt
|
6786ef3235
|
Merge branch 'szzh' into cxt_course
|
2016-01-05 15:38:19 +08:00 |
|
Tim
|
06fa32f0e2
|
博客高度控制
|
2016-01-05 15:23:37 +08:00 |
|
cxt
|
c4886306d4
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-05 15:05:51 +08:00 |
|
cxt
|
94eaf608c3
|
Merge branch 'cxt_course' into szzh
|
2016-01-05 15:05:39 +08:00 |
|
huang
|
428eb018a3
|
隐藏注册中“组织一列”
|
2016-01-05 15:02:39 +08:00 |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
 guange
|
1b177a8498
|
默认禁用自动高度
|
2016-01-05 11:55:30 +08:00 |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
2016-01-05 11:29:30 +08:00 |
|
huang
|
680e861620
|
项目资源搜索功能
|
2016-01-05 11:00:26 +08:00 |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
2016-01-05 10:01:56 +08:00 |
|
huang
|
ce085a23b0
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 17:08:42 +08:00 |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
2016-01-04 17:08:15 +08:00 |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
2016-01-04 17:05:32 +08:00 |
|
guange
|
d2c7d12cd9
|
merge
|
2016-01-04 15:53:56 +08:00 |
|
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +08:00 |
|
ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
2016-01-04 15:36:02 +08:00 |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
2016-01-04 15:12:38 +08:00 |
|
huang
|
b79a50ce2f
|
issue回复添加附件
|
2016-01-04 12:33:43 +08:00 |
|
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
2016-01-04 11:32:48 +08:00 |
|
cxt
|
a4a29b0ee9
|
关联项目的文字样式调整
|
2016-01-04 11:26:42 +08:00 |
|
cxt
|
28d491495a
|
Merge branch 'develop' into cxt_course
|
2016-01-04 11:25:43 +08:00 |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
2016-01-04 11:11:42 +08:00 |