 huang
|
b08a8e8050
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-22 15:52:05 +08:00 |
|
huang
|
96aa9b7261
|
实训项目一些调整，api和结构
|
2017-02-22 08:54:38 +08:00 |
 Linda
|
81ac923e3b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:57:49 +08:00 |
|
Linda
|
7451838509
|
syllablus.css和sy.public.css简化转移到 css文件夹；修改页面中引用这两个样式的路径
|
2017-02-21 14:51:48 +08:00 |
|
huang
|
f59243ab9f
|
实训api改进及一些提醒
|
2017-02-21 14:34:17 +08:00 |
|
huang
|
d21350b754
|
tpi先建任务权限判断
|
2017-02-20 14:39:39 +08:00 |
|
huang
|
336c28ccdb
|
实训项目权限控制
|
2017-02-20 12:33:27 +08:00 |
|
Linda
|
54eb9b0bca
|
网站底部版权信息居中
|
2017-02-20 10:48:36 +08:00 |
 daiao
|
77f58d76a5
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
# db/schema.rb
|
2017-02-19 09:21:55 +08:00 |
|
huang
|
a43c5cdb2f
|
启动实训Api等
|
2017-02-18 17:44:50 +08:00 |
|
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
 cxt
|
c1301bbd7d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-17 15:02:24 +08:00 |
|
cxt
|
11eba7637f
|
班级头部信息展示由三行更新成两行
|
2017-02-14 16:29:28 +08:00 |
|
daiao
|
bc0be4c890
|
项目社区首页的左侧导航栏，样式问题
|
2017-02-14 10:03:38 +08:00 |
|
daiao
|
603d5d5703
|
底部导航的版权限制中，空格太大
|
2017-02-14 09:59:06 +08:00 |
|
cxt
|
f844e44675
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-10 17:13:02 +08:00 |
|
daiao
|
271cb31f18
|
上线测试版缺陷修复
|
2017-02-10 16:01:55 +08:00 |
|
cxt
|
888531f7c2
|
首页访问“待匿评作品”中如下作业报500
|
2017-02-10 15:41:26 +08:00 |
|
cxt
|
4a0310f88c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/public.css
|
2017-02-10 14:37:28 +08:00 |
|
cxt
|
e4ebd4dd2c
|
班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成)
|
2017-02-10 14:35:43 +08:00 |
|
daiao
|
eb5ee64825
|
对于隐藏版本库的项目，版本库对报告人员不可见
|
2017-02-10 11:13:02 +08:00 |
|
daiao
|
3e705fabb8
|
平台底部调整（去除底部图片，增加合作伙伴一栏）
|
2017-02-09 10:47:18 +08:00 |
|
cxt
|
0b510df8b1
|
班级资源的延期发布精确到小时、班级、项目资源上传弹框改版
|
2017-02-08 13:54:04 +08:00 |
|
daiao
|
eb5f5f9ede
|
资源库：上传资源弹框使用新样式
|
2017-02-08 13:42:53 +08:00 |
|
cxt
|
bd7e595695
|
班级/项目/组织资源库：更新资源版本、删除资源，如图显示不用加粗的
|
2017-01-20 16:58:54 +08:00 |
|
cxt
|
6d84085d61
|
santo用户的铃铛消息-未读消息列表一直显示“正在加载中。。”
|
2017-01-20 15:39:40 +08:00 |
|
cxt
|
65bfaedb3a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-01-20 13:56:34 +08:00 |
|
huang
|
dd2fc230d0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-20 13:42:24 +08:00 |
|
cxt
|
6b9a847fe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
public/stylesheets/css/courses.css
|
2017-01-20 13:39:44 +08:00 |
|
huang
|
d13940af61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-20 10:26:28 +08:00 |
|
cxt
|
ac80805932
|
班级统计功能（暂未完成）
|
2017-01-20 10:16:51 +08:00 |
|
huang
|
c50266e264
|
开源检索按钮调整
|
2017-01-20 10:13:30 +08:00 |
|
huang
|
94822a5c95
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
|
2017-01-20 09:57:05 +08:00 |
|
daiao
|
6619ee9c20
|
开源检索功能
|
2017-01-20 09:52:10 +08:00 |
|
huang
|
113d7e9fc1
|
修复blog消息和小铃铛中的bug
|
2017-01-19 17:46:18 +08:00 |
|
Linda
|
33d5ed9d95
|
未登录导航搜索样式显示问题
|
2017-01-19 16:32:08 +08:00 |
|
daiao
|
a2aea42868
|
Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-01-19 15:57:55 +08:00 |
|
huang
|
e1f107bf4f
|
课程提供开源检索配置功能
|
2017-01-19 15:51:53 +08:00 |
|
daiao
|
9dff530d49
|
点击小铃铛查看全部，跳入个人主页
|
2017-01-19 14:12:19 +08:00 |
|
daiao
|
0fc90ba6fc
|
正式版footer中除掉“关于我们”
|
2017-01-19 14:02:30 +08:00 |
|
Linda
|
20fbfa7441
|
一、学习并使用RubyMine修改平台上css代码，修改Bug“我的缺陷列表下拉模块在ie11,火狐浏览器中显示问题”
二、平台css结构优化
1 所有在用样式均已分离并模块化，大致分为公共、课程、项目、个人、问吧；
2 css代码精简，基本保证无重复，存储体积减少：如public.css原83KB，精简后76KB；project.css原58KB，现50KB等；
3 基本解决页面引用无效css代码的情况，加快页面访问速度；
4 老版本蓝色代码均已全部替换为现有版本蓝色代码，实现界面统一美观；
5 头部导航细节调整：鼠标移动到导航背景颜色变浅、增加边距、搜索框右移、下拉链接颜色由红色改为深蓝色、头像圆角；
6 老版本直角浅蓝按钮均已替换为新版蓝色圆角按钮。
|
2017-01-18 16:49:18 +08:00 |
|
cxt
|
d35245f7e4
|
班级配置页面的改版：基本信息、成员、组织、讨论区设置
|
2017-01-17 16:49:36 +08:00 |
|
daiao
|
b1a71d12a9
|
新注册用户（或资料不全的用户），进入的首页“基本资料”编辑页，导航栏显示新版
|
2017-01-17 16:12:01 +08:00 |
|
黄井泉
|
518bad811c
|
Merge branch 'develop' into 'develop'
周五上线缺陷修复
See merge request !127
|
2017-01-13 17:44:29 +08:00 |
|
daiao
|
cd76f92405
|
博客回复消息加入小铃铛；申请加入项目的操作样式修改
|
2017-01-13 17:00:43 +08:00 |
|
huang
|
fbc70614ed
|
申请类消息冲突问题、user base几个取值的修改
|
2017-01-13 16:00:51 +08:00 |
|
daiao
|
0591440c9e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/users/_user_message_forge.html.erb
db/schema.rb
|
2017-01-13 11:28:33 +08:00 |
|
黄井泉
|
c177230b08
|
Merge branch 'develop' into 'develop'
这周上线任务
See merge request !122
|
2017-01-13 11:24:07 +08:00 |
|
huang
|
d5a0133b0b
|
个人主页部分优化
|
2017-01-12 16:19:11 +08:00 |
|
daiao
|
fd61782739
|
修复申请加入项目被审批后，出现的审批人名字错误的缺陷
|
2017-01-12 10:19:10 +08:00 |