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

14470 Commits

Author SHA1 Message Date
huang 5601ae0f54 pull request的一些提示改进 2016-11-28 12:18:03 +08:00
daiao 2a768cbd49 Innov用户消息通知报500，并将Pull request的登录名改为姓名 2016-11-28 11:32:28 +08:00
huang 42e301659e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-28 09:24:29 +08:00
guange c2629ebdc0 有几处相同的content key 2016-11-26 17:06:17 +08:00
huang ecf5101ef2 pull request 列表增加源项目/姓名 目标项目/姓名 2016-11-25 20:34:59 +08:00
huang 99ac546782 Merge branch 'develop' of https://git.trustie.net/Hjqreturn/trustieforge into develop 2016-11-25 20:14:02 +08:00
huang 8318bced7f pull request添加权限控制 2016-11-25 20:13:37 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt ba03065f9f “未参与”状态的还原 2016-11-25 19:58:27 +08:00
cxt c965f72ce3 还原回复的隐藏 2016-11-25 19:19:38 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
cxt ae7b8b2857 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 18:40:18 +08:00
cxt 9115020a43 匿评状态调整 2016-11-25 18:40:04 +08:00
黄井泉 d54cee6fc5 Merge branch 'dai_ao' into 'develop' 
项目头部样式修改



See merge request !26
 2016-11-25 18:05:07 +08:00
cxt 8a52e136cf 点击展开回复 2016-11-25 18:01:50 +08:00
huang 872d8295e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 17:51:30 +08:00
huang 9c12e774d1 pull request 文件内容正则修改 2016-11-25 17:50:37 +08:00
daiao c640535cca 项目头部样式调整 2016-11-25 17:39:55 +08:00
黄井泉 00c8673f4a Merge branch 'dai_ao' into 'develop' 
项目头部样式修改，fork数目不对



See merge request !23
 2016-11-25 17:19:15 +08:00
daiao 5c9cbe3936 Merge branch 'develop' into dai_ao 2016-11-25 17:16:33 +08:00
daiao f1b6e67e50 项目头部样式修改，fork数目错误 2016-11-25 17:10:49 +08:00
huang 8393679c9c 项目关注车成员列表结构梳理 2016-11-25 17:08:11 +08:00
cxt ebda1d7d54 测试版课程列表报500 2016-11-25 16:17:02 +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
huang 25ffa16c06 pull request 未改动及已合并提醒 2016-11-25 15:15:29 +08:00
daiao c02e507f0d Merge branch 'develop' into dai_ao 2016-11-25 15:01:22 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
huang b15fd1607f 里程碑issue统计，加入未指派，调整total位置，并按成员issue的数量排序 2016-11-25 14:50:23 +08:00
cxt 76902450c0 班级测验：如图描述显示多了一个空格 2016-11-25 14:45:25 +08:00
cxt b3724f01da 班级作品列表的“未参与”相关优化 2016-11-25 14:40:26 +08:00
cxt 88c4a26303 Merge branch 'cxt_course' into develop 2016-11-25 14:03:01 +08:00
cxt faa894cb56 分组作业关联的项目若已删除则给出提示 2016-11-25 13:54:31 +08:00
cxt 3d63d2ae2c 老师反馈：学生列表中“导出列表”不显眼 2016-11-25 13:37:31 +08:00
daiao 09506c0954 项目成员,关注成员，fork新页面 2016-11-25 12:17:27 +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
daiao e6e4a320ee 项目关注列表 2016-11-25 10:47:48 +08:00
cxt 6a6dda2ec3 课程大纲：如图“归档”按钮显示换行了 2016-11-25 10:39:24 +08:00
huang 2f07aefd36 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 10:34:06 +08:00
huang 58790bcb72 版本库删除数据一致性 解决Gitlab本身bug，删除操作会报异常的问题 2016-11-25 10:31:03 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
huang abc6eafdb4 修复删除版本库功能 2016-11-24 16:04:29 +08:00
yuanke 4fcddf743d 项目简介单词不换行修改 2016-11-24 15:15:52 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
yuanke 7713fba2f8 个人留言列表优化 2016-11-24 14:30:24 +08:00
yuanke d28f597aed Merge branch 'develop' into yuanke_youhua 2016-11-24 10:53:41 +08:00
yuanke 86da6a0fe7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-24 10:53:22 +08:00
daiao f7db47be41 Merge branch 'dai_ao' into develop 2016-11-24 10:45:43 +08:00
daiao 980ae78185 修改pull request发送源项目提示 2016-11-24 10:11:59 +08:00
daiao 5ed9d169f3 Merge branch 'develop' into dai_ao 2016-11-24 10:05:18 +08:00
cxt f6034b56f0 作业的提交截止时间一直显示 2016-11-24 09:53:36 +08:00
daiao 1c0b4e99a8 项目配置，创建版本库提示字样式调整，和Pull Requests页面的tab点击样式调整 2016-11-24 09:47:10 +08:00
huang 42dee92c60 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 17:18:42 +08:00
daiao 61a3ffcbd0 项目issue统计显示顺序按任务量排序，调整total位置和样式并增加未指派一栏 2016-11-23 17:18:12 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
yuanke 2dc6171b48 微信反馈时的提示语加入www.trustie.net 2016-11-23 16:40:31 +08:00
yuanke 82fa7600da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 09:29:02 +08:00
daiao 85f9f636a2 修复：里程碑关闭，编辑issue，里程碑被清空的情况 2016-11-22 16:51:16 +08:00
huang fca68c24dc pull_request合并到源项目的问题 2016-11-22 15:05:33 +08:00
daiao 196d3b31a1 为完 切换分支 2016-11-22 14:29:03 +08:00
cxt f9d12758d4 班级分班：如图在某具体分班中，编辑某成员分班为“暂无”或其他分班，原始分班列表未自动刷新 2016-11-22 11:29:45 +08:00
huang 79b1cdcf84 pull request 源项目拉取代码及提交 2016-11-22 11:06:18 +08:00
cxt eeacd76aa9 首页班级列表的归档 2016-11-22 10:27:56 +08:00
yuanke c571d19548 项目简介单词不换行 2016-11-22 10:16:09 +08:00
yuanke 88057fdf4e Merge branch 'develop' into yuanke_youhua 
Conflicts:
	app/views/projects/show.html.erb
 2016-11-22 10:15:15 +08:00
yuanke 8d980b16db 换行修改 2016-11-22 10:10:53 +08:00
daiao 0eb6a607b2 项目issue中，附件名称后缀显示不全 2016-11-22 09:23:16 +08:00
yuanke f1ad70bb33 关注BUG修改，修改密码BUG修改 2016-11-22 08:52:19 +08:00
daiao 428cb8e928 项目issue。里程碑为空，完成为100%的issue筛选不了 2016-11-21 17:21:15 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
daiao e585687e9c 铃铛消息，将登录名改为用户姓名，并将部分没有链接的加链接 2016-11-21 16:30:37 +08:00
daiao c31287f2f5 temp用户，铃铛消息报500，并修改点击名称进个人主页（目前申请类消息点击进自己主页） 2016-11-21 15:21:51 +08:00
cxt 62ea9d12f7 项目简介的样式调整 2016-11-21 14:11:35 +08:00
yuanke 6cb711d66b Merge branch 'develop' into yuanke_youhua 2016-11-21 10:14:08 +08:00
yuanke 14552abd56 博客人气排序修改，个人主页关注BUG修改 2016-11-21 10:08:27 +08:00
daiao c74fe9278a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:31:01 +08:00
huang 8238f5bcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:21:38 +08:00
huang 90cf429a10 fork 弹出新页面 2016-11-18 21:20:44 +08:00
daiao 609d1d2fb4 新建和编辑issue时，里程碑被清空的bug 2016-11-18 21:19:34 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
daiao f9a384b253 Merge branch 'dai_ao' into develop 2016-11-18 19:18:36 +08:00
cxt cf6acd48c4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:17:47 +08:00
daiao 286422e1c5 我的issue样式调整 2016-11-18 19:17:35 +08:00
huang c7d781d58c 删除和fork弹框居中并统一值 2016-11-18 19:13:14 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
daiao f91722a422 我的issue样式调整 2016-11-18 17:46:51 +08:00
cxt 20465ef281 导航栏题库“发送”后的提示弹框丢失了 2016-11-18 17:37:25 +08:00
cxt 4da94a5bb0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 17:32:55 +08:00
cxt 149ecc0b99 只有班级创建者才能归档和恢复 2016-11-18 17:32:45 +08:00
huang 9b2d4b8a07 新建项目边框问题 2016-11-18 17:31:48 +08:00
cxt 6bb4e650c4 QQ反馈返回空白页、“返回上一页”不能点击时字体置灰 2016-11-18 17:21:23 +08:00
huang 7f1d12de04 项目版本库标题改成用户名加版本库名 2016-11-18 17:08:36 +08:00
huang b1b456e63e 项目标题去掉姓名，单词不换行 2016-11-18 16:57:45 +08:00
cxt 9a30369cef 班级作业：两种身份（助教和学生）的成员匿评扣分错误 2016-11-18 16:37:25 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
huang 5f35e8bd97 修复新注册用户不能fork的问题 2016-11-18 16:20:18 +08:00
huang d48c2a36fc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 16:09:28 +08:00
huang 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 3b2e33f3ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 15:45:20 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
daiao 1e761081c2 我的issue样式调整 2016-11-18 14:45:42 +08:00
cxt db71b1578b 新建作业的时候，必须先选择作业类型 2016-11-18 10:43:49 +08:00
huang f87d1ce3bd ISSUE中指派者按中文姓名排序 2016-11-18 10:04:02 +08:00
daiao b8e59430e8 项目资源库，资源描述框宽度增加至800px 2016-11-18 09:46:28 +08:00
daiao 440e73ea99 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 09:36:03 +08:00
daiao 19483ee762 新建和编辑issue时，选择里程碑按创建时间的倒序排列 2016-11-18 09:35:49 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
cxt 4d7dbc1fc6 已发布的试卷显示提交情况 2016-11-17 17:07:01 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang edb86615a2 个别用户修改资料500问题 2016-11-17 12:20:12 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
cxt 6c8736bea8 加入班级时的提示修改 2016-11-17 11:10:48 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
huang 987b5ba6db 注释掉消息中的新闻 2016-11-16 13:54:47 +08:00
huang 75a05ba9c2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:50:26 +08:00
huang 1dd97ee253 个人主页的项目收藏列表提示错误 2016-11-16 13:50:10 +08:00
daiao 12ccd69167 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:37:15 +08:00
daiao 05fcd32225 修复项目issue，编辑issue“完成度”为100%后，该issue历程被清空 2016-11-16 13:36:57 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 5dcb99c3ad 优化projects数据库表，删除不必要的字段 2016-11-15 16:38:30 +08:00
huang 8843ff7686 质量分析公共部分封装，没有权限用户删除的时候显示灰色不可点击 2016-11-15 15:58:50 +08:00
huang 3ab5ab4e4b 代码质量分析列表优化 2016-11-15 15:34:15 +08:00
cxt 57c82effed 讨论区帖子：新建时没有字数限制，编辑时却有字数限制了，不合理 2016-11-15 15:04:24 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 1e5d3e05ad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 14:09:40 +08:00
huang 0ea9a49f86 质量分析界面调整 2016-11-15 14:09:25 +08:00
daiao d45b1c7d4c 我的issue 2016-11-15 14:03:57 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
cxt 7988257e10 项目讨论区：如图多级回复，“点击展开更多”要用新的样式 2016-11-15 11:19:31 +08:00
cxt 5d0954d108 班级申请消息通知，如图以省略号结束的消息，当鼠标移至此消息，消息应该显示完全 2016-11-15 10:54:31 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
cxt d8906db1aa 班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新 2016-11-15 10:34:14 +08:00
yuanke 19e2c34917 测试代码还原 2016-11-15 10:33:28 +08:00
yuanke 85938bf3f1 测试 2016-11-15 09:28:42 +08:00
yuanke e33146813d 加日志测试 2016-11-15 09:25:58 +08:00
huang e9ec3ca258 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 09:02:15 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt ef9b389cfc 作业动态报500 2016-11-14 17:32:18 +08:00
daiao 442be21a30 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:48:22 +08:00
daiao 98849931d6 项目新建/编辑issue，调整“里程碑”提示 2016-11-14 16:47:45 +08:00
cxt 5605a9e638 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-14 16:37:54 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang ddb747bfcb 解决login中带特殊字符的问题 2016-11-14 16:35:15 +08:00
huang 2b1a73e692 解决用户登录名的.号问题 2016-11-14 16:33:49 +08:00
huang 695ce6c2e4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:07:16 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
cxt b06dcc9db4 780班级访问分班报500 2016-11-14 15:38:00 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
yuanke 5134418388 Merge branch 'yuanke_youhua' into develop 2016-11-14 15:14:05 +08:00
cxt 96bc35552a 未收藏的班级和项目动态不显示 2016-11-14 15:11:37 +08:00
daiao f4df8716d3 issue查看页，新增新建按钮 2016-11-14 13:28:41 +08:00
yuanke 5fd00ae472 关注官方微信改为关注微信APP 2016-11-14 10:35:40 +08:00
yuanke d0abc8d3ad Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 19:52:38 +08:00
yuanke 369f6eb9f7 微信动态不显示的BUG修复 2016-11-11 19:52:30 +08:00
cxt a2b0717aaa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:41:36 +08:00
cxt 3aec93e5e4 分组作业的作品列表展开/收起 2016-11-11 18:41:29 +08:00
cxt a831be59d0 匿评时点击姓名和关联的项目应打开作品详情 2016-11-11 18:31:00 +08:00
huang 5104340b78 Merge branch 'dev_newproject' into develop 2016-11-11 18:21:29 +08:00
huang 6752b8fa62 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:19:19 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
cxt 809cb5a344 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:12:31 +08:00
cxt acfbe6f03e 某用户为某班级的助教和学生两种角色成员，当前身份是助教，点击个人主页“我的作业”，如图对应的班级作品显示的却是“提交作品”-》 “查看作品” 2016-11-11 18:12:22 +08:00
huang 561c96b485 用户图像下拉列表中我的课程、组织链接改成登录名 2016-11-11 18:02:17 +08:00
daiao 753da4b078 点击用户将id改为用户名 2016-11-11 17:59:34 +08:00
huang e6354c82cf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:57:45 +08:00
huang bb871b5a77 个人主页 博客 粉丝 关注url的id改成登录名 2016-11-11 17:57:31 +08:00
cxt 6ee9b12c5d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:55:32 +08:00
cxt c352fb5604 学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数 2016-11-11 17:55:25 +08:00
huang 7e762a42ed 用户动态部分url的id改成登录名 2016-11-11 17:50:42 +08:00
cxt 18bfb26689 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:38:25 +08:00
cxt e1c216ef80 班级导入问卷不可用 2016-11-11 17:38:19 +08:00
daiao 1ec0100386 项目简介样式调整，并且输入网页能点击 2016-11-11 17:35:11 +08:00
cxt 4a266b33e6 新建课程增加示例，并追加班级的说明tip 2016-11-11 17:26:38 +08:00
huang d040d2efd1 版本库添加返回上一级目录 2016-11-11 17:21:18 +08:00
cxt ec36b07aab 分班名称编辑后，如图班级左侧导航处未自动刷新 2016-11-11 17:05:47 +08:00
huang b944a4a5c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:00:10 +08:00
huang 9113c93e49 项目成员列表点击跳入新的页面 2016-11-11 16:59:34 +08:00
cxt 93c10515df Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:59:28 +08:00
cxt 7298e983fa 如图课程大纲中“加入班级”，输入错误的邀请码，提示“您加入的班级不存在”不合理，应该是“您输入的邀请码错误” 2016-11-11 16:59:15 +08:00
huang f71a21155f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:54:47 +08:00
huang a655e73c50 配置中成员链接改成登录名 2016-11-11 16:54:24 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
 2016-11-11 16:53:20 +08:00
cxt 16c51e1eaa 基于项目的分组作业没有显示项目详情 2016-11-11 16:50:25 +08:00
huang 8c48c3d420 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:46:07 +08:00
huang f41a36557a 时间插件改为英文 2016-11-11 16:45:43 +08:00
daiao e1afe9d2d7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:36:13 +08:00
daiao 92531ce487 项目简介样式调整 2016-11-11 16:35:26 +08:00