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

13079 Commits

Author SHA1 Message Date
daiao ed448f0087 Merge branch 'develop' into dev_shcool 
Conflicts:
	db/schema.rb
 2016-09-09 09:31:17 +08:00
daiao 2ee9c22186 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 2016-09-09 09:16:49 +08:00
daiao aa27d7def2 修复编辑issue，更新附件时，自动回复提示问题（不同Issue下，重名不显示，同意issue下，会更新创建时的附件） 2016-09-09 09:16:22 +08:00
yuanke d6ae177885 Merge branch 'weixin_guange' into develop 2016-09-09 09:05:59 +08:00
yuanke 4adc988ec1 微信图片url修改 2016-09-09 08:35:08 +08:00
yuanke 7a71a7bd47 Merge branch 'weixin_guange' into develop 2016-09-08 18:54:18 +08:00
yuanke a6b03ed9f1 微信头像刷新修改 2016-09-08 18:53:36 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
yuanke 8c71cf1946 Merge branch 'weixin_guange' into develop 2016-09-08 18:18:13 +08:00
yuanke 5c626f94b5 微信二级回复框不显示修改 2016-09-08 18:04:37 +08:00
yuanke 2ad432c5ce 调试 2016-09-08 17:51:36 +08:00
cxt cf25dc8dfd 首页的项目列表 2016-09-08 15:00:20 +08:00
yuanke be0158fbb0 微信二级回复BUG修改 2016-09-08 14:10:58 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
yuanke d8a4eb56cf 微信上传头像修改 2016-09-07 15:14:46 +08:00
yuanke c234a8d2cb 个人资料修改功能 2016-09-07 14:19:07 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
cxt 7b2943c37a 重试 2016-09-06 18:01:16 +08:00
cxt 8edfec258b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-06 17:51:20 +08:00
cxt 7b2ce93acc 分组作业添加成员 2016-09-06 17:51:13 +08:00
Tim 99e63b1477 班级推荐数字block颜色字体更改；测验学号超出省略号显示 2016-09-06 17:22:38 +08:00
cxt e2aef37114 分组作品的提交出错 2016-09-06 17:06:31 +08:00
cxt bf4c6d049c 新建分组作业时不创建作品列表 2016-09-06 16:38:29 +08:00
cxt 17f6b9c286 管理员界面的被留言内容加上“RE: ” 2016-09-06 15:17:49 +08:00
cxt 1e7f3db946 分组作业：组内每个成员都复制一份组长的作业，得分相同 2016-09-06 15:07:43 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
yuanke f5ef2bac50 微信回复的回复后台修改 2016-09-05 17:06:25 +08:00
daiao cdd4dfcf09 项目列表中：私有项目对非成员显示，非成员不点击进入 2016-09-05 16:55:56 +08:00
yuanke a07462076d 微信回复的回复后台功能完善 2016-09-05 16:38:25 +08:00
cxt 252851b4ad 课程导航的修改 2016-09-05 16:36:43 +08:00
yuanke fd3c0effe5 Merge branch 'develop' into weixin_guange 2016-09-05 14:50:06 +08:00
yuanke 6f7b40b5ad 微信增加回复的回复后台代码 2016-09-05 14:49:22 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool 
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
 2016-09-05 13:47:39 +08:00
daiao bb0bafb0fd 1.修复项目名称太长，导致动态显示名称与issue编辑图标按钮重叠 2016-09-05 13:27:41 +08:00
Tim f94b048af2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-05 13:18:55 +08:00
Tim 9ec6074260 将头部帮助中心改为贴吧交流 2016-09-05 13:18:35 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
huang 3e17edecd1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 19:05:46 +08:00
huang 2cd41cde7f 1706项目500问题 2016-09-02 19:05:21 +08:00
cxt c794c6197d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 18:19:43 +08:00
huang 7b6657a3e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:51:23 +08:00
huang 2c03bfbf3a 资源提示权限控制 2016-09-02 16:51:05 +08:00
cxt 22e914eec2 查看他人的留言动态报500 2016-09-02 16:42:19 +08:00
cxt b8d04c1352 课程列表的主讲老师改为创建老师 2016-09-02 16:40:07 +08:00
cxt 2a9ac3c11e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:22:07 +08:00
cxt 01ca94bc98 未读消息弹框 2016-09-02 16:21:58 +08:00
daiao 9a3603c778 1.基本资料页面，身份为从业者时，直接点确定报提示问题 
2.强制修改基本资料，修改资料按键错误
 2016-09-02 16:11:14 +08:00
yuanke 66aec27714 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:09:00 +08:00
yuanke 6571b94bf1 Merge branch 'weixin_guange' into develop 2016-09-02 16:08:49 +08:00
cxt 0d2a3cbe36 测试版消息列表报500 2016-09-02 16:00:54 +08:00