3621 Commits

Author	SHA1	Message	Date
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
yuanke	6571b94bf1	Merge branch 'weixin_guange' into develop	2016-09-02 16:08:49 +08:00
yuanke	ed7308969c	微信帖子删除后显示	2016-09-02 15:45:07 +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
Tim	d0a2ea02f2	学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示	2016-09-02 14:27:49 +08:00
Tim	9e317c4a8f	二级回复英文单词过长不折行	2016-09-02 13:54:34 +08:00
Tim	0974153364	课程加入路径显示	2016-09-02 13:49:08 +08:00
yuanke	12f854f31b	Merge branch 'weixin_guange' into develop	2016-09-02 10:55:43 +08:00
yuanke	a6bb19eb60	微信动态回复增加点赞	2016-09-02 10:54:40 +08:00
Tim	2316b3fe7b	回复添加点赞	2016-09-02 10:21:50 +08:00
yuanke	5cda2292d0	Merge branch 'weixin_guange' into develop	2016-09-02 09:48:35 +08:00
yuanke	5d47ee0c43	修改项目班级动态BUG	2016-09-02 09:42:45 +08:00
Tim	0dff52ff09	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-09-01 16:01:25 +08:00
Tim	40f5510195	侧导航文字和按钮不重合	2016-09-01 16:01:16 +08:00
yuanke	aaa263f01e	Merge branch 'weixin_guange' into develop	2016-09-01 15:58:16 +08:00
yuanke	0a398b38da	修改按钮颜色	2016-09-01 15:57:29 +08:00
Tim	4d93b860f9	作品信息确认时，描述文字折行	2016-09-01 15:35:45 +08:00
Tim	d080f0bb16	Merge branch 'cs_optimize_txz' into develop	2016-09-01 14:34:56 +08:00
Tim	4c64e883ea	加入班级、项目时，增加获取邀请码提示	2016-09-01 14:30:21 +08:00
yuanke	11ed1ea345	Merge branch 'weixin_guange' into develop	2016-09-01 14:11:20 +08:00
Tim	76b7469f75	课程列表icon缩小	2016-09-01 14:04:53 +08:00
Tim	27a2da8b7b	意见反馈增加二维码	2016-09-01 13:56:13 +08:00
yuanke	a6241afe04	.	2016-09-01 13:36:27 +08:00
yuanke	251fd36748	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-09-01 11:18:52 +08:00
yuanke	d4f8bd29f4	班级项目成员管理BUG修改	2016-09-01 11:18:42 +08:00
huang	52a8a64a69	项目隐藏 项目讨论区发送中去掉课程	2016-09-01 10:48:13 +08:00
Tim	742100d9b5	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-09-01 10:41:32 +08:00
Tim	2251869881	iphone下视角滚动	2016-09-01 10:40:57 +08:00
yuanke	8644ad178c	修复班级项目 删除成员的BUG	2016-09-01 10:21:29 +08:00
yuanke	c3c2516e6b	微信班级、项目增加删除成员和退出功能	2016-08-31 17:19:12 +08:00
cxt	9b3e1e0275	Merge branch 'develop' into cxt_course	2016-08-31 15:02:13 +08:00
cxt	9c327fe05e	at符号前面是标点符号或没有空格还是弹出用户列表。	2016-08-31 14:59:27 +08:00
Tim	eda735db58	footer文字居中	2016-08-31 14:40:34 +08:00
Tim	d11f673711	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-08-31 14:30:32 +08:00
Tim	ec15474c3a	成员管理更改时，确定按钮样式变更	2016-08-31 14:30:16 +08:00
yuanke	6c5eaf2779	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-08-31 14:21:50 +08:00
yuanke	292e778a8c	微信班级项目增加删除和退出功能	2016-08-31 14:21:38 +08:00
cxt	a8575f2a15	暂时隐藏个人名片	2016-08-31 14:08:19 +08:00
Tim	48f110bbc8	新增退出项目，成员管理删除	2016-08-31 13:53:11 +08:00
Tim	e0fed38f1d	新增退出班级及删除成员	2016-08-31 10:53:58 +08:00
yuanke	e37a2fee1e	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-08-30 14:25:46 +08:00
yuanke	b4a5179a1b	修改班级成员管里的配置返回后显示空白及@issue链接无效的问题	2016-08-30 14:25:36 +08:00
Tim	14ece14b78	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-08-30 14:12:15 +08:00
Tim	bc1caf3d54	表情处理	2016-08-30 14:12:05 +08:00
yuanke	4e312595fe	Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange	2016-08-30 14:08:23 +08:00
yuanke	8a6ad89973	issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等	2016-08-30 14:08:10 +08:00
huang	bbe44b3957	Merge branch 'develop' into rep_quality	2016-08-30 11:18:49 +08:00