Commit Graph

14809 Commits

Author SHA1 Message Date
cxt b26a6b5195 消息弹窗的链接无效 2016-06-20 11:24:34 +08:00
txz b17b92cc3e 微信回复后先加载后启用回复按钮 2016-06-20 11:08:57 +08:00
yuanke 0719313f01 Merge branch 'yuanke' into develop 2016-06-20 09:41:26 +08:00
yuanke 7c729107cc KE复制粘贴的时候保留图片的外链 2016-06-20 09:40:21 +08:00
yuanke 4b7fa3a040 修改有的组织不能修改资源描述的问题 2016-06-20 09:19:50 +08:00
guange f40794282f . 2016-06-17 18:54:24 +08:00
guange 762ca9c3cb . 2016-06-17 18:50:43 +08:00
guange 9d19caa736 . 2016-06-17 18:48:27 +08:00
guange b9280caf36 . 2016-06-17 18:46:15 +08:00
guange 64ad182a84 . 2016-06-17 18:42:58 +08:00
guange 46018ad388 . 2016-06-17 18:41:16 +08:00
guange 3582849ef3 . 2016-06-17 18:40:03 +08:00
guange a0c0a65d18 绑定用户迁移到接口 2016-06-17 18:37:26 +08:00
guange 7aec37bb3a . 2016-06-17 18:25:55 +08:00
guange 98c6548e39 重写登录和注册 2016-06-17 18:18:03 +08:00
huang fce93de296 500问题 2016-06-17 18:03:58 +08:00
huang e4105b538a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 17:36:14 +08:00
huang 6af0bf7b83 组织样式 2016-06-17 17:35:46 +08:00
yuanke f3014c3993 Merge branch 'yuanke' into develop 2016-06-17 17:25:53 +08:00
huang 1135e99b5a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 17:20:30 +08:00
huang 2464586ed2 组织样式问题 2016-06-17 17:20:17 +08:00
yuanke 948ec58248 作业二级回复未登录显示样式问题 2016-06-17 17:18:36 +08:00
cxt 3492f65a9b 编程作业匿评时的列表宽度调整 2016-06-17 16:57:11 +08:00
Tim 4b62a39b15 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-17 16:49:57 +08:00
txz 18df93ba9f 微信动态列表界面问题 2016-06-17 16:16:24 +08:00
txz acf17d6252 微信详情页面链接添加颜色 2016-06-17 15:45:29 +08:00
txz 994ce342d7 微信ul布局优化 2016-06-17 15:35:58 +08:00
cxt 2685e263d0 Merge branch 'develop' into cxt_course 2016-06-17 15:11:30 +08:00
cxt 7b1efe193d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 14:45:16 +08:00
cxt eb3694dbe6 消息报500 2016-06-17 14:45:07 +08:00
yuanke 811afbdf33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 14:43:25 +08:00
huang 7d68df79a0 组织合并凌彬代码500问题 2016-06-17 14:44:12 +08:00
yuanke b942be7162 Merge branch 'yuanke' into develop 2016-06-17 14:42:49 +08:00
yuanke fde3fd0d94 新建贴吧跳入该贴吧帖子列表,组织栏目配置默认选择第一个栏目类型 2016-06-17 14:40:00 +08:00
yuanke d6d9a366f2 Merge branch 'develop' into yuanke
Conflicts:
	public/stylesheets/new_user.css
2016-06-17 14:36:12 +08:00
huang 0f17ac0e9e Merge branch 'lingbing' into develop
Conflicts:
	app/views/organizations/_org_custom_header.html.erb
2016-06-17 14:33:31 +08:00
huang 8741917823 访问统计 (自2016年5月) 2016-06-17 14:31:42 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00
cxt a105f4eaf0 课程动态中:课程讨论区、课程通知
项目动态中:项目issue、项目新闻、项目讨论区
个人动态:如上动态
未登录时不显示齿轮
2016-06-17 14:09:43 +08:00
yuanke 747b2007cd 项目中未登录提示按钮样式问题 2016-06-17 13:44:11 +08:00
huang 88b838a89a Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-06-17 11:33:48 +08:00
huang 35ee17c4ca Merge branch 'yuanke' into develop 2016-06-17 11:32:50 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
cxt 1dac05c6d1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-17 11:26:58 +08:00
yuanke 3ae26a6530 组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。 2016-06-17 11:23:49 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
huang d127c6e12c 访问添加自某年某月 2016-06-17 09:45:10 +08:00
cxt 795917688c 留言内容无法展开、收起 2016-06-17 09:34:48 +08:00
huang 227f2343a4 登录注册背景图片替换 2016-06-16 17:14:13 +08:00
huang 260bef0ebb 登录祖册鼠标经过颜色 2016-06-16 17:01:51 +08:00