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

12414 Commits

Author SHA1 Message Date
yuanke ca60496e7b 微信 新建项目默认为私有 2016-07-28 18:21:42 +08:00
yuanke 1489ab015a 微信模版消息标题加上句号 2016-07-28 17:55:37 +08:00
yuanke 93844e757c 微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	db/schema.rb
	public/assets/wechat/homework_detail.html
	public/javascripts/wechat/controllers/activity.js
 2016-07-28 15:23:12 +08:00
yuanke 6d594cfcbe git pull后重新commit 2016-07-28 15:11:04 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
yuanke 4fe60bfc97 微信课程角色修改 2016-07-27 14:56:41 +08:00
yuanke 653b98d832 微信增加项目相关内容 2016-07-27 14:30:19 +08:00
guange c5dd2eaf41 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-07-26 18:28:28 +08:00
cxt 1f8fa1c70a 班级动态去掉“>” 2016-07-26 17:16:42 +08:00
cxt d17a9dabd8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/helpers/courses_helper.rb
 2016-07-26 16:59:20 +08:00
daiao 0d59f5a358 Merge branch 'daiao_dev' into develop 2016-07-26 16:57:18 +08:00
cxt 04207609cb 未配置课程的班级打开报500 2016-07-26 16:54:34 +08:00
huang f12423e8a6 issue动态中不能删除问题 2016-07-26 16:29:03 +08:00
huang d51295127d issue删除回复删除附件的问题 同事关联删除 2016-07-26 16:13:20 +08:00
daiao 3661969528 修改课程下，课件名称，显示尽可能全 2016-07-26 14:48:36 +08:00
daiao 1dcf4918b9 非管理员用户在新建帖子时，置顶及锁定功能在页面不显示 2016-07-26 14:30:12 +08:00
huang e7f862458f issue回复问题； 二级回复编辑issue弹空白框问题 2016-07-26 12:06:54 +08:00
daiao 6ab2c15504 修复先删除课程下的某班级，再删除该课程报错 2016-07-26 10:38:04 +08:00
huang b01e228d51 修复issue回复不能点击的问题 2016-07-26 09:19:55 +08:00
huang 2c8f94c899 去掉ID转换成用户login 2016-07-26 09:02:47 +08:00
yuanke 04e9551450 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-26 08:52:52 +08:00
daiao 67bdea314a 作品列表-分班过滤：点击“请选择分班”过滤显示所有学生 2016-07-25 19:53:56 +08:00
daiao 4646d13234 1.修改资源课程名称，竟可能显示全。 
2.班级动态下，去掉“班级动态>”
 2016-07-25 18:54:44 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
yuanke 4f803ce0de Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-25 17:02:52 +08:00
yuanke db7c267a47 微信单个项目动态 2016-07-25 17:02:42 +08:00
guange 9d2900d58f 解决没绑定用户不跳转到绑定页问题 2016-07-25 16:59:52 +08:00
guange fb91309646 merge 2016-07-25 15:36:29 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
huang 7984affe36 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-25 14:10:48 +08:00
daiao 9ff728f080 Merge branch 'develop' into daiao_dev 
Conflicts:
	app/views/layouts/_syllabus_base_info.html.erb
 2016-07-25 10:03:50 +08:00
cxt df80362899 增加空格 2016-07-25 09:58:17 +08:00
huang 1320097bf9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-25 09:47:37 +08:00
huang 43c6301223 id转换成用户名 2016-07-25 09:47:14 +08:00
cxt 11c9fba7e7 提示信息修改 2016-07-22 18:58:41 +08:00
cxt dc9c0f924b 教师列表和学生列表的样式 2016-07-22 18:39:50 +08:00
cxt 48d5b89338 课程推荐为0的不显示 2016-07-22 18:26:48 +08:00
cxt 60fe1854cd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-22 18:20:48 +08:00
huang ab4d85dcb7 组织500问题 2016-07-22 18:21:27 +08:00
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
cxt 45fb2d0a3e Merge branch 'develop' into cxt_course 2016-07-22 17:14:28 +08:00
cxt 6d4835c6cc 样式调整 2016-07-22 17:13:40 +08:00
cxt 808b553e43 班级动态只有10条，底部却显示“点击展开更多” 2016-07-22 16:50:32 +08:00
huang 0e1a52726f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/base_syllabus.html.erb
 2016-07-22 16:46:01 +08:00
huang 4d79f93079 Merge branch 'cs_optimize_txz' into develop 2016-07-22 16:43:17 +08:00
cxt 27fa113de1 组织动态报500 2016-07-22 16:40:28 +08:00
cxt 27afee03b2 编辑课程的英文名称时输入框不清空 2016-07-22 16:38:09 +08:00
cxt 02a5254943 课程大纲的回复展开更多无反应 2016-07-22 16:36:25 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00