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

3675 Commits

Author SHA1 Message Date
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
Tim e30416f6b3 手机表情处理 2016-08-30 10:49:44 +08:00
huang ee2ae456ac unresolved issues for sonar 2016-08-30 10:43:47 +08:00
Tim ac0cc37fe4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 16:39:23 +08:00
Tim ea0211c9ca 组织搜索成员时，页数过多折行问题 2016-08-29 16:39:13 +08:00
cxt 4ff45c15a3 还原质量分析的代码 2016-08-29 15:43:32 +08:00
cxt acb18ca4c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:40:26 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
Tim a8d551105b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-29 15:28:45 +08:00
Tim 64b7aedd1c footer部分logo与链接替换更新 2016-08-29 15:28:32 +08:00
cxt 1e169985a4 访问计数的颜色调整 2016-08-29 15:23:35 +08:00
cxt 95ec047653 班级名称过长时，动态中标题显示与动态编辑图标按钮重叠 2016-08-29 14:12:42 +08:00
Tim a467338161 iphone定位js 2016-08-29 11:32:11 +08:00
huang a6f9c3375e 代码质量分析加入“未解决质量问题数” 2016-08-29 10:21:42 +08:00
Tim d940f957ec css问题更改 2016-08-26 18:36:59 +08:00
huang 803bd9819a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/css/public.css
 2016-08-26 17:55:51 +08:00
huang 420a17a7e4 资源提示统计数字及权限修改 2016-08-26 17:34:17 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 16:23:07 +08:00
Tim 3f7c623163 新增资源提示框 2016-08-26 15:57:45 +08:00
cxt 62e28f638c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb
 2016-08-26 14:33:18 +08:00
cxt 774b5eca89 课程和项目的头像点击可编辑 2016-08-26 14:31:14 +08:00
Tim a8f30fe85f 个人主页，课程，项目头像、logo增加编辑按钮 2016-08-26 11:31:54 +08:00
yuanke 82779c99ea 字符串去掉空白时，空格不去掉。 2016-08-26 09:59:00 +08:00
cxt f4b5a5cf4e Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-26 09:23:33 +08:00
Tim fbad4ecd8a 班级页面logo及行间距调整；测导航数字大小背景调整 2016-08-25 17:52:19 +08:00
Tim 3e78dec32a 将课程、项目公用类放至public.css中 2016-08-25 16:07:57 +08:00
cxt cb5e5f18ce Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-25 15:59:15 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
Tim df1039cd09 项目收藏按钮位置调整 2016-08-25 15:55:36 +08:00
yuanke ea238cd407 微信班级发布问题改为发起讨论 2016-08-25 15:45:39 +08:00
yuanke 589df7e498 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 15:34:22 +08:00
yuanke 5b73e7dc19 修改发布帖子标题的长度及班级动态中不显示头像 2016-08-25 15:34:13 +08:00
Tim 6b4e25520d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 14:30:50 +08:00
Tim 78123b5db7 iphone设备输入时，自动定位到输入框 2016-08-25 14:30:42 +08:00
yuanke bb2a1de98c 资源详情返回更多按钮BUG修改 2016-08-25 14:26:31 +08:00
yuanke fd2021a1fe 微信资源界面发送后返回处理 2016-08-25 14:05:21 +08:00
Tim ae09d7ff27 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-25 13:39:13 +08:00
Tim bb935e42a8 发帖时，标题字符限制；发布按钮不遮住输入框 2016-08-25 13:39:02 +08:00
yuanke aa11f39b2d Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/class.html
	public/javascripts/wechat/controllers/class.js
 2016-08-25 11:24:27 +08:00
yuanke 3673ed3f1d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 10:55:59 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
huang 61fe0fc77c 项目讨论区发帖时 标题为空 内容为空给出提示 2016-08-25 10:50:18 +08:00
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +08:00
Tim 7682a4d45d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-24 17:03:11 +08:00
Tim a13ec60173 修复无效的css 2016-08-24 17:02:59 +08:00
cxt 7d89f69981 班级和项目收藏夹 2016-08-24 15:58:23 +08:00
cxt 6af43070c7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-08-24 13:56:53 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
Tim 57ecffc130 班级新增收藏功能 2016-08-24 10:28:09 +08:00
yuanke c26f59e697 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-23 16:53:05 +08:00
yuanke c612104fab 微信增加发帖功能 2016-08-23 16:52:35 +08:00
Tim c8c5f5d415 iphone下flex无效 2016-08-23 16:36:59 +08:00
Tim 7d671c7758 调整输入框padding值 2016-08-23 15:04:48 +08:00
Tim 34acb1aa2f 课程项目增加发布按钮 2016-08-23 11:05:49 +08:00
yuanke e473a18487 提交错分支 还原 2016-08-23 10:26:39 +08:00
yuanke 55512f9eb2 Merge branch 'develop' into weixin_guange 2016-08-23 10:24:46 +08:00
Tim bbc0277d39 iphone端输入框js控制 2016-08-23 10:23:55 +08:00
yuanke 965d8930dc 班级增加动态 2016-08-23 10:23:46 +08:00
Tim 863ec9d396 iphone下输入框位置调整 2016-08-22 16:50:14 +08:00
yuanke 864c6c821f Merge branch 'weixin_guange' into develop 2016-08-22 16:50:13 +08:00
Tim 4f3f6358fc Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-22 14:30:00 +08:00
Tim a846eda77b 输入框padding调整；发帖样式新增 2016-08-22 14:29:43 +08:00
yuanke 75d81d5dba 前端判断是否绑定屏蔽 2016-08-22 14:09:29 +08:00
cxt 572ad5a162 个人主页的课程和项目展开出现重复数据 2016-08-22 10:49:46 +08:00
Tim 19becbfdf3 邀请内容更改 2016-08-14 16:06:37 +08:00
Tim 2659b742fd 成员管理头像高度不一致；邀请内容格式调整 2016-08-14 15:30:57 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop 
Conflicts:
	db/schema.rb
 2016-08-14 09:56:17 +08:00
yuanke 8ab003d5ee 分享页提交回复未关注公众号会跳到二维码界面 2016-08-14 09:38:47 +08:00
huang d7faed7f6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-13 15:39:06 +08:00
guange 70d58ccf85 恢复授权页 2016-08-13 15:24:52 +08:00
huang 0c6e1b2ccb 版本库样式修改，显示全时间 2016-08-13 14:42:51 +08:00
guange 4a88fbe3db . 2016-08-13 13:36:15 +08:00
huang 1b19d227f9 项目列表样式及连接 2016-08-13 10:17:38 +08:00
Tim 083d5453d4 加入课程、项目弹框，在内容部分不能拖拽 2016-08-13 10:00:31 +08:00
huang 75971120f7 Merge branch 'develop' into rep_quality 2016-08-12 17:14:18 +08:00
Tim 6734904945 班级详情页面定位 2016-08-12 15:34:53 +08:00
Tim 5eb397aa2a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/login_tip.html
 2016-08-12 14:49:21 +08:00
Tim bdeb8297cb 关注提示页面 2016-08-12 14:45:33 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke 3b42861a54 分享修改 2016-08-12 13:33:57 +08:00
yuanke 822ca15c78 分享修改 2016-08-12 11:34:09 +08:00
yuanke c0dc070c15 分享修改 2016-08-12 11:25:43 +08:00
yuanke 5c42cdb39c 分享内容时改为用户信息授权方式 2016-08-12 10:40:36 +08:00
yuanke 6af15b7121 微信自动绑定用户修改 2016-08-12 09:23:09 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
yuanke c26e2a9acc 私有动态BUG修改 2016-08-11 14:09:41 +08:00
yuanke d74924ff67 私有动态提示修改 2016-08-11 13:51:20 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33:22 +08:00
yuanke 61ffa58896 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-11 09:59:00 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
huang 56afad9242 质量分析列表中添加时间和版本 2016-08-11 09:48:29 +08:00
Tim 8d753f55dc 班级、项目动态增加“私有内容，谨慎传播”提示 2016-08-10 17:10:22 +08:00
Tim b5af6f2c7f 绑定说明页面 2016-08-10 16:45:31 +08:00
Tim f5f88c5204 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-10 16:09:13 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
Tim e85f9373c8 点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改 2016-08-10 15:37:08 +08:00
cxt fa07f2532f 题库弹框样式修改 2016-08-10 11:16:04 +08:00
cxt 0ed508a887 题库预览弹窗的调整 2016-08-09 17:09:36 +08:00
yuanke 66357c4024 修改分享链接 2016-08-09 17:01:06 +08:00
cxt 9594aada50 Merge branch 'cxt_course' into develop 
Conflicts:
	public/javascripts/application.js
 2016-08-09 16:42:23 +08:00
cxt fc3df1c26f 题库预览弹框的样式调整 2016-08-09 16:38:17 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
cxt 4a527dc84e Merge branch 'cs_optimize_txz' into develop 2016-08-09 15:25:01 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
yuanke b53979d91c 修改微信头像不显示的BUG，动态暂时全部去掉认证！ 2016-08-09 10:20:21 +08:00
yuanke bd908af765 修改报错BUG 2016-08-09 09:33:34 +08:00
yuanke 61ba668818 函数写错名称 2016-08-09 09:30:30 +08:00
yuanke 57f3aaa9e8 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-09 09:23:19 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
Tim d4f08f6498 课程logo替换，邀请码样式更改，班级路径显示主讲教师 2016-08-05 17:30:13 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
Tim e8d4bc0772 弹框可拖拽 2016-08-05 16:13:37 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
Tim be5e74897a 项目弹框位置调整 2016-08-05 15:26:15 +08:00
Tim cb6750cd01 输入时，忘记密码和绑定按钮重合的bug 2016-08-05 14:50:10 +08:00
Tim 82644bcd81 加入班级、项目弹框可拖拽 2016-08-05 14:36:01 +08:00
Tim 56452d69f4 侧导航字体大小，颜色更改 2016-08-05 14:11:35 +08:00
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
yuanke 491b6fcb72 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-04 18:10:47 +08:00
yuanke bb46aa4745 微信点击已审批模版消息进入界面显示修改 2016-08-04 18:09:54 +08:00
Tim 1335dc1b76 提示文字取消粗体 2016-08-04 17:27:53 +08:00
Tim 28a29fa724 拖拽删除 2016-08-04 16:50:33 +08:00
yuanke d5df45e8fb 项目动态点入详情后返回需回到点入的项目动态处 2016-08-04 16:35:07 +08:00
cxt b7c05fed4a 首页样式和js调整 2016-08-04 16:33:51 +08:00
yuanke 55afb84aef 模版消息标题加上句号，审核模版消息再次点击显示修改 2016-08-04 15:32:25 +08:00
yuanke e4a414e550 微信菜单跳入加入项目和班级界面点取消要能返回公众号界面 2016-08-04 14:37:04 +08:00
yuanke 12a9c95c01 微信项目及班级邀请码相关BUG修改 2016-08-04 14:07:35 +08:00
Tim b8a40862ce 改变行代码格式化，不折行 2016-08-04 14:04:55 +08:00
yuanke 3c2ab32121 微信动态分享修改 2016-08-04 11:17:50 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
yuanke 4bae4527a2 微信分享URL修改 2016-08-04 10:48:13 +08:00
yuanke aaa1c01eed 微信动态分享图片修改 2016-08-04 10:47:35 +08:00
yuanke c0579de57d 微信分享内容修改 2016-08-04 10:00:55 +08:00
yuanke 13d59be389 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-04 09:09:50 +08:00
yuanke 17c98eb9fe 微信分享修改 2016-08-04 09:08:18 +08:00
Tim 7b6675ed6a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/assets/wechat/join_project.html
 2016-08-03 16:41:15 +08:00
Tim 950b18c250 加入班级提示 2016-08-03 16:39:22 +08:00
yuanke 29e707a88d 微信加入项目修改、二级回复三个回复时多了个边框BUG修改等 2016-08-03 16:31:33 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
yuanke a34272027e 微信菜单及项目班级审核修改 2016-08-03 14:55:54 +08:00