 huang
|
7490c7f90d
|
添加图片链接和用户名链接
|
2016-03-31 17:51:23 +08:00 |
|
huang
|
45343a44b8
|
修改链接
|
2016-03-31 17:13:40 +08:00 |
|
huang
|
6af8c48d3b
|
Merge branch 'hjq_beidou' into develop
|
2016-03-31 17:06:30 +08:00 |
|
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
|
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
 linchun
|
2af261056c
|
h回复改过的分页错误代码，修改有误
|
2016-03-31 15:33:48 +08:00 |
|
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-31 15:25:24 +08:00 |
|
huang
|
c6f6030e10
|
组织新样式
|
2016-03-31 15:25:02 +08:00 |
 cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
2016-03-31 15:21:40 +08:00 |
|
linchun
|
914117230e
|
解决管理员界面用户列表报500错误的bug，，分页错误
|
2016-03-31 15:15:11 +08:00 |
|
huang
|
cf946687d0
|
类型
|
2016-03-31 14:02:35 +08:00 |
|
huang
|
3465a39285
|
添加配置
隐藏不显示
|
2016-03-31 13:07:12 +08:00 |
|
cxt
|
37e3377fd3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
|
2016-03-31 09:44:35 +08:00 |
|
cxt
|
6a5b79cf6d
|
管理员的作业页面报500
|
2016-03-31 09:44:21 +08:00 |
|
huang
|
da1438b04e
|
Merge branch 'hjq_beidou' into develop
|
2016-03-30 19:34:03 +08:00 |
|
huang
|
8f43341f81
|
新建组织为空的情况
|
2016-03-30 19:17:29 +08:00 |
|
huang
|
b64e8a5f9e
|
完成所有图片自动适应转换
|
2016-03-30 19:02:41 +08:00 |
|
huang
|
bded9f2e98
|
图片自动获取功能
|
2016-03-30 18:35:47 +08:00 |
|
huang
|
0244008b32
|
一些链接和样式
|
2016-03-30 17:33:22 +08:00 |
|
huang
|
7c55356ace
|
组织新界面修改
|
2016-03-30 17:22:23 +08:00 |
|
linchun
|
d98eb8748e
|
修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列
|
2016-03-30 14:17:12 +08:00 |
|
huang
|
f2106d0045
|
more链接添加，区分两种模式
|
2016-03-29 20:33:16 +08:00 |
|
huang
|
a26cf19b86
|
配置中配置模式
|
2016-03-29 20:14:07 +08:00 |
|
huang
|
8a6a1b94ee
|
组织资源的统计与权限
|
2016-03-29 20:09:47 +08:00 |
|
huang
|
961a264e05
|
创建时间统一date
|
2016-03-29 19:04:51 +08:00 |
|
huang
|
65e80b1978
|
用户图像样式
|
2016-03-29 18:25:16 +08:00 |
|
cxt
|
668a724064
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
|
2016-03-29 18:22:51 +08:00 |
|
cxt
|
69373468ae
|
作品详情打不开
|
2016-03-29 18:22:41 +08:00 |
 alan
|
9452254b62
|
去掉缓存机制
|
2016-03-29 17:39:20 +08:00 |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
2016-03-29 16:54:44 +08:00 |
|
huang
|
7c9e20c9bf
|
登录注册样式
|
2016-03-29 16:51:50 +08:00 |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
2016-03-29 16:45:14 +08:00 |
|
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:43:52 +08:00 |
 yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
2016-03-29 15:56:02 +08:00 |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
2016-03-29 15:54:44 +08:00 |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
2016-03-29 15:46:13 +08:00 |
 ouyangxuhua
|
7f0959c972
|
题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式
|
2016-03-29 15:25:22 +08:00 |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-29 13:51:46 +08:00 |
|
huang
|
2b9ddf3594
|
组织新版
|
2016-03-29 13:43:28 +08:00 |
|
ouyangxuhua
|
56f8d4854b
|
恢复代码
|
2016-03-29 12:38:02 +08:00 |
|
alan
|
e9069f0225
|
fix merge bug
|
2016-03-29 12:29:23 +08:00 |
|
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-03-29 11:36:49 +08:00 |
|
huang
|
b80bc98fcb
|
组织首页
|
2016-03-29 11:31:58 +08:00 |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
2016-03-29 10:15:18 +08:00 |
|
ouyangxuhua
|
598f69abb0
|
组织显示模式暂时隐藏
|
2016-03-29 09:35:07 +08:00 |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +08:00 |
|
cxt
|
8e7d25a483
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-28 17:20:52 +08:00 |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
2016-03-28 17:20:46 +08:00 |
|
huang
|
64f13a04cc
|
动态500问题
|
2016-03-28 17:09:42 +08:00 |
|
huang
|
b8463fcca5
|
北斗
|
2016-03-28 16:51:58 +08:00 |
|
cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
2016-03-28 15:35:24 +08:00 |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
2016-03-28 15:11:37 +08:00 |
|
huang
|
9fc227d619
|
资源库问题
|
2016-03-28 14:50:26 +08:00 |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
2016-03-28 14:11:40 +08:00 |
|
ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
2016-03-28 13:03:13 +08:00 |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
2016-03-28 11:24:31 +08:00 |
|
huang
|
326730f6b1
|
北斗框架
|
2016-03-28 10:39:09 +08:00 |
|
yuanke
|
2ceef7d3e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 21:12:22 +08:00 |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
2016-03-25 21:11:13 +08:00 |
|
yuanke
|
a58ba8080c
|
编程作业加个日志
|
2016-03-25 21:06:25 +08:00 |
|
huang
|
c7c96e0c6a
|
公共资源附件名编辑问题
|
2016-03-25 20:37:32 +08:00 |
|
huang
|
fc006d64bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:11:45 +08:00 |
|
huang
|
1bf494f661
|
课程推荐资源统计数
|
2016-03-25 20:11:26 +08:00 |
|
cxt
|
0d5bad1ddd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:11:00 +08:00 |
|
cxt
|
35faa12d4d
|
组织编辑文章无法提交
|
2016-03-25 20:10:53 +08:00 |
|
ouyangxuhua
|
f0d6bb7fae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:08:20 +08:00 |
|
ouyangxuhua
|
26b81fb8b3
|
组织文章列表回复问题解决
|
2016-03-25 20:07:55 +08:00 |
|
huang
|
777e585d4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 19:21:07 +08:00 |
|
huang
|
ba25f41bcb
|
添加教师统计数、学生统计数
|
2016-03-25 19:20:36 +08:00 |
|
ouyangxuhua
|
00d2542964
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 19:09:48 +08:00 |
|
ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
2016-03-25 19:09:25 +08:00 |
|
alan
|
e764075bd6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:36:53 +08:00 |
|
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
2016-03-25 17:34:32 +08:00 |
|
ouyangxuhua
|
2261081dc2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:17:15 +08:00 |
|
alan
|
6862480632
|
修改当用户没有项目时，报错
|
2016-03-25 17:16:45 +08:00 |
|
ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
2016-03-25 17:16:36 +08:00 |
|
alan
|
4587e728d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:07:42 +08:00 |
|
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
2016-03-25 17:07:30 +08:00 |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
2016-03-25 16:38:21 +08:00 |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
2016-03-25 16:33:22 +08:00 |
|
huang
|
cca570e75c
|
课程相关优化
|
2016-03-25 16:30:00 +08:00 |
|
alan
|
3b48b3add7
|
refactor cache
|
2016-03-25 16:26:33 +08:00 |
|
alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-25 16:16:55 +08:00 |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
2016-03-25 16:06:14 +08:00 |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
2016-03-25 15:59:49 +08:00 |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
2016-03-25 15:58:17 +08:00 |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
2016-03-25 15:46:40 +08:00 |
|
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-25 15:42:37 +08:00 |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +08:00 |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
2016-03-25 14:43:51 +08:00 |
|
huang
|
9549d695f6
|
讨论区局部优化
|
2016-03-25 14:29:58 +08:00 |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
2016-03-25 13:57:00 +08:00 |
|
ouyangxuhua
|
7b24b053a5
|
Merge branch 'develop' into ouyang
|
2016-03-25 12:35:13 +08:00 |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
2016-03-25 12:30:33 +08:00 |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
2016-03-25 10:42:26 +08:00 |
|
alan
|
04b4823ac2
|
user_activities 加cache
|
2016-03-25 10:27:28 +08:00 |