 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 |
|
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 |
|
huang
|
cf946687d0
|
类型
|
2016-03-31 14:02:35 +08:00 |
|
huang
|
20ea251cab
|
添加字段
|
2016-03-31 14:01:09 +08:00 |
|
huang
|
3465a39285
|
添加配置
隐藏不显示
|
2016-03-31 13:07:12 +08:00 |
|
huang
|
da1438b04e
|
Merge branch 'hjq_beidou' into develop
|
2016-03-30 19:34:03 +08:00 |
|
huang
|
5621f01284
|
权限访问控制
|
2016-03-30 19:31:43 +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
|
f15857e49b
|
Merge branch 'linchun' into develop
|
2016-03-30 15:32:16 +08:00 |
 alan
|
1f0f7708c6
|
fix pagination bug
|
2016-03-30 15:09:06 +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
|
3c9f88c767
|
Merge branch 'develop_new' into develop
|
2016-03-29 18:28:03 +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
|
88a4b8ce6c
|
Merge branch 'alan_develop' into develop
|
2016-03-29 16:44:06 +08:00 |
|
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:43:52 +08:00 |
|
alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
2016-03-29 16:43:14 +08:00 |
 ouyangxuhua
|
2d4296ef96
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:07:26 +08:00 |
|
ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
2016-03-29 16:07:00 +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 |
|
ouyangxuhua
|
9e599da365
|
组织动态，点击展开更多没有反应问题解决
|
2016-03-29 15:47:05 +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
|
68edc792e9
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
2016-03-29 13:48:26 +08:00 |
|
huang
|
2b9ddf3594
|
组织新版
|
2016-03-29 13:43:28 +08:00 |
|
ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
2016-03-29 13:22:18 +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 |
|
cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 10:39:51 +08:00 |