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

16529 Commits

Author SHA1 Message Date
Tim 96e7d14060 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-06 09:17:40 +08:00
Tim 05170c43ed 微信动态详情二级回复 2016-09-06 09:17:29 +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
cxt 7123c66481 课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面 2016-09-05 16:20:38 +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
cxt ad0acb5188 课程大纲的内容图片自适应大小 2016-09-05 14:31:49 +08:00
cxt 2974833533 新建班级页面--创建课程后面，增加： 然后 【刷新】 2016-09-05 14:14:25 +08:00
cxt 573eb13283 课程导航中的用户是创建该课程的老师，课程链接应跳到该用户的课程列表 2016-09-05 13:52:42 +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 4601cbb8eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-05 13:29:06 +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
cxt 36e541a6d0 消息列表报500 2016-09-05 11:30:13 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
cxt 0a57f07e29 Merge branch 'develop' into cxt_course 2016-09-05 10:38:58 +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 2197e9aeda Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 16:40:16 +08:00
cxt b8d04c1352 课程列表的主讲老师改为创建老师 2016-09-02 16:40:07 +08:00
yuanke f540ac282d Merge branch 'weixin_guange' into develop 2016-09-02 16:37:16 +08:00
Tim 92ae8865f0 删注释 2016-09-02 16:35:16 +08:00
Tim 77c727e18a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-09-02 16:34:46 +08:00
Tim 7fe1394403 ios自动定位输入框 2016-09-02 16:34:33 +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
yuanke ed7308969c 微信帖子删除后显示 2016-09-02 15:45:07 +08:00
cxt 877d1930f0 超级管理员应该有权限查看不公开学生列表班级的学生列表 2016-09-02 15:35:20 +08:00
cxt b588495847 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:26:23 +08:00
huang 6c0bcadf6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:27:08 +08:00
huang ec51d27eaf Merge branch 'rep_quality' into develop 2016-09-02 15:26:41 +08:00
cxt e949566d3d 合并 2016-09-02 15:26:00 +08:00
cxt aaefd8b4aa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-09-02 15:24:55 +08:00
huang 58176456e1 Merge branch 'develop' into rep_quality 2016-09-02 15:23:00 +08:00
cxt 4cdef4a22b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 15:22:20 +08:00
cxt 613f974440 项目的管理员和课程的老师都有权限删除帖子和新闻/通知的回复 2016-09-02 15:22:09 +08:00
huang 3881e5c5c5 资源搜索的是时候tip局部刷新 
组织资源更新公开私有问题
 2016-09-02 14:50:06 +08:00
Tim 0d7e9d4f9b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-09-02 14:45:11 +08:00