Commit Graph

12975 Commits (7490c7f90d3391b9cd0fe9c1bb4fb737bc140fef)
 

Author SHA1 Message Date
huang 7490c7f90d 添加图片链接和用户名链接
9 years ago
huang 45343a44b8 修改链接
9 years ago
huang 6af8c48d3b Merge branch 'hjq_beidou' into develop
9 years ago
huang f662bfa40b 组织科配置
9 years ago
huang c431658333 setting中后台编辑
9 years ago
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
9 years ago
huang c6f6030e10 组织新样式
9 years ago
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的”
9 years ago
huang cf946687d0 类型
9 years ago
huang 20ea251cab 添加字段
9 years ago
huang 3465a39285 添加配置
9 years ago
huang da1438b04e Merge branch 'hjq_beidou' into develop
9 years ago
huang 5621f01284 权限访问控制
9 years ago
huang 8f43341f81 新建组织为空的情况
9 years ago
huang b64e8a5f9e 完成所有图片自动适应转换
9 years ago
huang bded9f2e98 图片自动获取功能
9 years ago
huang 0244008b32 一些链接和样式
9 years ago
huang 7c55356ace 组织新界面修改
9 years ago
linchun f15857e49b Merge branch 'linchun' into develop
9 years ago
alan 1f0f7708c6 fix pagination bug
9 years ago
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间,并且按时间倒序排列
9 years ago
huang f2106d0045 more链接添加,区分两种模式
9 years ago
huang a26cf19b86 配置中配置模式
9 years ago
huang 8a6a1b94ee 组织资源的统计与权限
9 years ago
huang 961a264e05 创建时间统一date
9 years ago
huang 3c9f88c767 Merge branch 'develop_new' into develop
9 years ago
huang 65e80b1978 用户图像样式
9 years ago
cxt 668a724064 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
9 years ago
cxt 69373468ae 作品详情打不开
9 years ago
alan 9452254b62 去掉缓存机制
9 years ago
huang 2728cccd41 Merge branch 'develop' into hjq_beidou
9 years ago
huang 7c9e20c9bf 登录注册样式
9 years ago
huang d28a46c48a 北斗资源库板块
9 years ago
alan 88a4b8ce6c Merge branch 'alan_develop' into develop
9 years ago
alan e4fc9f39e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
alan 200561da92 修改《私有资源公共资源中不显示》
9 years ago
ouyangxuhua 2d4296ef96 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
ouyangxuhua 74d8dffc14 发送功能样式调整
9 years ago
yuanke be1351a4d8 Merge branch 'yuanke' into develop
9 years ago
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG
9 years ago
ouyangxuhua 9e599da365 组织动态,点击展开更多没有反应问题解决
9 years ago
alan 03d855f5d5 修改资源区分页问题
9 years ago
ouyangxuhua 7f0959c972 题库发送输入框中文能正常输入并调整样式;调整发送功能的其他样式
9 years ago
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou
9 years ago
huang 68edc792e9 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
9 years ago
huang 2b9ddf3594 组织新版
9 years ago
ouyangxuhua 2275b367f4 在organization控制器的show方法添加layout
9 years ago
ouyangxuhua 56f8d4854b 恢复代码
9 years ago
alan e9069f0225 fix merge bug
9 years ago
alan eb1c6ccf85 Merge branch 'alan_develop' into develop
9 years ago