Commit Graph

17217 Commits

Author SHA1 Message Date
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
yuanke db76ca93d8 打开压缩gem包 2016-10-20 14:41:54 +08:00
cxt 453e91dcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 14:24:13 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
huang cfbabf3eac 样式 2016-10-20 14:06:57 +08:00
daiao 295524af5c 项目里程碑样式 2016-10-20 13:58:41 +08:00
huang df5458675e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-20 13:34:16 +08:00
huang 16b6c55637 注释掉id转换成登录名 2016-10-20 13:34:02 +08:00
daiao b45aec9134 项目配置-里程碑,版本库页面调整 2016-10-20 13:33:25 +08:00
cxt 59f0101a62 个人主页的链接改成登录名 2016-10-20 13:32:33 +08:00
huang 786110f711 还原 2016-10-20 13:31:05 +08:00
yuanke e802629d27 Merge branch 'develop' into weixin_guange
Conflicts:
	app/models/student_work.rb
	app/models/student_work_test.rb
	app/views/blog_comments/show.html.erb
	public/javascripts/homework.js
2016-10-20 13:28:23 +08:00
huang 1b8bf05be5 用户ID装换成用户名 2016-10-20 13:26:11 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 70c7b0d12c 设为主页后页面未刷新 2016-10-19 20:44:14 +08:00
cxt e5cfcdc038 个人主页列表的翻页 2016-10-19 20:33:39 +08:00
cxt dde8be3f94 主页内容自动识别链接 2016-10-19 20:13:26 +08:00
cxt 096bc145da 问卷样式调整 2016-10-19 20:05:21 +08:00
cxt 35caacf067 首页取消、添加关注不可用 2016-10-19 20:03:34 +08:00
cxt 9c1630b682 问卷的标题显示过长 2016-10-19 19:43:35 +08:00
cxt 251465ceb5 袁可 编程 2016-10-19 19:41:02 +08:00
cxt 85f489eb97 主页页面设为主页或取消首页后跳转至主页列表、已设为主页的始终显示在前方 2016-10-19 19:38:44 +08:00
cxt bebff7b24a “个人主页列表"变细体、编辑时也可设为主页 2016-10-19 19:05:42 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt 26121d895f 袁可 编程测试 2016-10-19 18:09:29 +08:00
cxt 800aaf8853 隐藏博客首页 2016-10-19 18:07:19 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
daiao b16a9d8ab6 项目配置样式调整 2016-10-19 17:45:24 +08:00
daiao cf4d908c5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:43:12 +08:00
daiao 1c80a89b8d 项目配置样式调整 2016-10-19 17:43:05 +08:00
huang 2c795cf08c 项目样式 2016-10-19 17:41:19 +08:00
huang fbb2bfce91 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 17:35:46 +08:00
huang 601de5d67f 项目base中统计数字四舍五入,数字中添加链接 2016-10-19 17:35:33 +08:00
daiao 269c061053 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:56:36 +08:00
daiao a9fa958f7f 项目配置,信息与模块样式调整 2016-10-19 16:56:25 +08:00
huang 2425f7e159 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:35:45 +08:00
huang a722cb0031 超过1w的用k+ 2016-10-19 16:35:26 +08:00
Tim 6b04c9144e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 16:29:15 +08:00
Tim 783ef3eae1 创建项目动态宽度调整 2016-10-19 16:29:04 +08:00
yuanke e42a42379d . 2016-10-19 16:02:16 +08:00
yuanke 33155b4185 修改代码测试rake 2016-10-19 15:54:40 +08:00
huang da78adc697 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:52:11 +08:00
huang c34209534d 版本库展开文件目录异步刷新 2016-10-19 15:51:55 +08:00
Tim a3126870a1 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:48:00 +08:00
Tim ae9a6eb928 版本库查看文件页面宽度调整 2016-10-19 15:47:50 +08:00
yuanke 122bf26927 修改代码测试rake 2016-10-19 15:36:27 +08:00
daiao c829749849 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:35:49 +08:00
daiao 7499f4659d 项目配置,成员界面,点击操作-编辑按钮,角色出现下拉列表框 2016-10-19 15:35:37 +08:00
huang 5571fb0f90 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:18:56 +08:00