jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,916 Commits 98 Branches 0 Tags 0 B
Commit Graph

4024 Commits

Author SHA1 Message Date
cxt 03b00f0af5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-06 16:17:46 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版" 
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
 2016-12-06 15:02:32 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt 
Conflicts:
	db/schema.rb
 2016-12-06 14:12:40 +08:00
cxt 88c8c4144b 编程作业新建和编辑的时候，测试输出集很长的显示不友好，调整 2016-12-05 17:18:56 +08:00
cxt bd458e1aef 班级的教师列表显示样式比较旧，更换样式 2016-12-05 14:17:33 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
cxt adac1d3d7a 班级问卷列表样式调整 2016-12-02 14:53:20 +08:00
黄井泉 9a83b81269 Merge branch 'develop' into 'develop' 
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;

See merge request !35
 2016-12-02 13:36:25 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
huang aea81f2b10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:23:55 +08:00
huang bd31af108e 提交历史现实样式整体变更 版本库中提交详情也现实样式调整 2016-12-02 11:26:15 +08:00
daiao 7e5fda197e 组织列表增加新建组织按钮，并将我的issue与issue列表的issue标题显示加长 2016-12-02 10:21:56 +08:00
huang c3745be0eb 项目版本库历史记录代码优化及界面调整 2016-12-02 10:21:48 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
daiao 7a8c937173 项目issue列表，讨论区，版本库，pullrequests，里程碑及其里程碑详情页面，数据为空时，页面调整 2016-12-01 17:29:14 +08:00
cxt 423018fa15 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-01 15:47:46 +08:00
cxt c33bf1b163 测验头部和新建题目的改版 2016-12-01 15:42:07 +08:00
cxt a2af654a91 具体作业的标题行右侧显示内容变更 2016-11-30 15:53:51 +08:00
huang a19f6ffd38 项目文件历史记录显示内容区分历史新增和删除 
项目变更文件高亮显示
 2016-11-29 17:05:14 +08:00
cxt fced64cc96 点击子域名申请消息报404 2016-11-29 16:22:58 +08:00
yuanke b6172fc31f Merge branch 'develop' into yuanke_youhua 2016-11-25 17:45:01 +08:00
yuanke 248276d088 KE工具栏不换行 2016-11-25 17:43:52 +08:00
黄井泉 00c8673f4a Merge branch 'dai_ao' into 'develop' 
项目头部样式修改，fork数目不对



See merge request !23
 2016-11-25 17:19:15 +08:00
daiao f1b6e67e50 项目头部样式修改，fork数目错误 2016-11-25 17:10:49 +08:00
yuanke 5675c3ab67 Merge branch 'develop' into yuanke_youhua 2016-11-25 16:01:50 +08:00
yuanke b1ae697c3d 页面缩小时页面下方需要出现左右滚动条 2016-11-25 16:00:41 +08:00
huang 636721699e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 15:16:09 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 88c4a26303 Merge branch 'cxt_course' into develop 2016-11-25 14:03:01 +08:00
daiao bff5a36577 pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果 2016-11-25 11:32:45 +08:00
cxt a614b4eb93 班级的讨论区列表与通知列表、项目的讨论区列表、博客列表：显示请微调 2016-11-25 11:25:04 +08:00
daiao 599d233176 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 10:49:57 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
yuanke d28f597aed Merge branch 'develop' into yuanke_youhua 2016-11-24 10:53:41 +08:00
daiao f7db47be41 Merge branch 'dai_ao' into develop 2016-11-24 10:45:43 +08:00
daiao 5ed9d169f3 Merge branch 'develop' into dai_ao 2016-11-24 10:05:18 +08:00
huang 42dee92c60 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 17:18:42 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
yuanke 9720f84fce js的自动转换URL函数autoUrl加上个异常处理 2016-11-23 13:29:02 +08:00
daiao 0eb6a607b2 项目issue中，附件名称后缀显示不全 2016-11-22 09:23:16 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
cxt 62ea9d12f7 项目简介的样式调整 2016-11-21 14:11:35 +08:00
cxt 14e457dc6a 360浏览器的“请选择作业类型”没显示完全 2016-11-18 21:19:36 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
cxt 0338e80f34 班级左侧导航栏的“+” 2016-11-18 19:39:36 +08:00
cxt edca878701 输入框的边框不显示 2016-11-18 19:31:52 +08:00
cxt 2786495774 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:28:31 +08:00
cxt 58ee1eb745 去掉500页面的“给我留言” 2016-11-18 19:28:18 +08:00