Commit Graph

12074 Commits

Author SHA1 Message Date
ouyangxuhua 5e72734bee 增加3个url定制路由 2016-01-22 09:25:58 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
ouyangxuhua b6460633d2 个人博客按更新时间倒排 2016-01-21 16:15:45 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后,跳转到个人首页 2016-01-21 16:11:06 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项 2016-01-21 15:31:36 +08:00
cxt 65563e6503 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-21 15:24:40 +08:00
cxt 219755e4d4 Merge branch 'cxt_course' into szzh 2016-01-21 15:24:29 +08:00
cxt 99cda66d00 编程作业:每次提交了测试集后,页面都会跳到作业页面的最底端,还得手动翻到页面最顶端,再点“发送” 2016-01-21 15:02:12 +08:00
ouyangxuhua 6b44b93f0e 在通知详情页面,也有发送按钮 2016-01-21 14:54:20 +08:00
cxt 5672b029fe 导入作业加提示语 2016-01-21 14:50:16 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一,分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
cxt f15847371c 附件显示过长 2016-01-21 10:36:30 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能 2016-01-20 17:23:02 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
huang 280bf01912 Merge branch 'dev_hjq' into szzh 2016-01-20 15:45:00 +08:00
cxt fe0414c83f 组织文章和博客的点赞 2016-01-20 10:53:05 +08:00
cxt 945ed84276 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 09:27:38 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-20 09:27:29 +08:00
ouyangxuhua 18e79ba9b3 未登陆情况下,可以看到组织文章列表及首页全部内容 2016-01-20 09:25:12 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
Tim cd3a1e59dd Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-19 17:03:10 +08:00
cxt f4afc24e3b Merge branch 'szzh' into develop 2016-01-19 17:03:06 +08:00
Tim 04fded784e 单词折行样式 2016-01-19 17:02:46 +08:00
ouyangxuhua e70e1beb5d Merge branch 'szzh' into dev_hjq 2016-01-19 16:59:04 +08:00
ouyangxuhua 7acfc22ee1 未登陆情况下,访问组织栏目增加margin-top:10px,已使样式正常 2016-01-19 16:58:15 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
ouyangxuhua d0c2eabddd 未登陆情况下,也能下载组织下的文件 2016-01-19 16:42:10 +08:00
cxt e293805488 点击在线问卷时若未登录则直接跳到登录页面 2016-01-19 15:41:53 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
cxt 6e582fa631 老师评阅作品时可以不写评语,只有学生匿评的时候才强制写评语 2016-01-19 09:55:28 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
2016-01-18 17:12:56 +08:00
cxt b4521d3582 课程/项目首页的更多默认收起 2016-01-18 16:18:40 +08:00
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
cxt 9cabb0248a 已点过赞的动态显示”已赞“ 2016-01-18 15:12:47 +08:00
ouyangxuhua 909e0e846b 路由配置问题 2016-01-18 11:06:08 +08:00
ouyangxuhua 5e102d24dd 解决个人博客报500的问题 2016-01-18 11:01:04 +08:00
ouyangxuhua f796aa1489 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-18 10:54:17 +08:00
ouyangxuhua 03df9abfeb 增加域名唯一性判断 2016-01-18 10:43:22 +08:00
cxt df57b13ce0 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/helpers/application_helper.rb
2016-01-18 10:16:09 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
ouyangxuhua c6aaaff8d1 对有子域名的组织,栏目的链接应不含有组织及其id 2016-01-18 10:07:12 +08:00
huang ed26242f94 版本库提交次数迁移 2016-01-15 21:19:52 +08:00
huang b2746d0953 课程讨论区总数计入回复数 2016-01-15 16:30:17 +08:00