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

3417 Commits

Author SHA1 Message Date
yuanke 6ee6cdf28f 微信项目加入审核修改 2016-08-03 10:56:55 +08:00
yuanke 65719add19 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-08-03 09:37:36 +08:00
yuanke 4ab2427827 微信项目及课程申请审核相关功能 2016-08-03 09:37:24 +08:00
guange 6f2b84570f 去除调试模式 2016-08-02 17:48:51 +08:00
guange 56d6f4b9bc 定制分享内容 2016-08-02 17:36:59 +08:00
guange 2a67ec5407 配置登录页菜单 2016-08-02 17:27:40 +08:00
yuanke 614e877e6e 微信项目和班级加入修改 2016-08-02 15:50:15 +08:00
yuanke fa43924330 微信项目二维码修改 2016-08-01 13:54:10 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
yuanke f3ae53dc97 Merge branch 'develop' into weixin_guange 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-08-01 09:21:31 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
daiao 5b93d40f67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/assets/wechat/app.html
	public/assets/wechat/new_project.html
	public/javascripts/wechat/directives/ellipsis.js
	public/stylesheets/weui/weixin.css
 2016-07-29 22:03:45 +08:00
daiao 39478eb4e4 Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool 
Conflicts:
	app/views/admin/applied_schools.html.erb
	app/views/admin/has_applied_schools.html.erb
 2016-07-29 21:50:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
yuanke 1f47eb5ea8 单位申请列表修改 2016-07-29 21:19:09 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
Tim b100651185 控制显示较多文字后显示省略号 2016-07-29 17:09:53 +08:00
Tim 9a3acdd1db 删除注释 2016-07-29 17:07:22 +08:00
Tim 6342137972 微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号 2016-07-29 17:06:25 +08:00
Tim 24a6aabb6b 新建项目说明列表圆点大小与间距调整 2016-07-29 16:56:55 +08:00
Tim 9e6575211f Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-29 16:29:58 +08:00
Tim 4e5f3e56c7 新建项目说明文字居中 2016-07-29 16:24:42 +08:00
yuanke 78e44617e3 Merge branch 'weixin_guange' into develop 2016-07-29 16:13:38 +08:00
daiao 4d3f4c358a 微信功能 2016-07-29 16:13:25 +08:00
Tim 4abce11004 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-29 16:11:52 +08:00
Tim 3d7b7b513b 隐藏文字超出省略号显示 2016-07-29 16:11:43 +08:00
Tim 43498e79e8 项目说明居中对齐 2016-07-29 16:09:55 +08:00
yuanke 18862fdee9 编辑课程文字修改 2016-07-29 16:06:30 +08:00
yuanke e478b050d1 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-29 15:47:47 +08:00
yuanke ce8f915d7e 分享修改成原来的 2016-07-29 15:47:34 +08:00
Tim a11dfcc9fb Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-29 15:40:58 +08:00
Tim 071ad88956 新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行 2016-07-29 15:40:47 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
yuanke 54e9367f71 分享标题内容修改 2016-07-29 10:52:35 +08:00
yuanke f1859151bc 修改新建项目、新建课程中的文字 2016-07-29 09:43:18 +08:00
yuanke 8bf69a2e4d Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-28 17:27:06 +08:00
yuanke 93844e757c 微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改 2016-07-28 17:26:57 +08:00
Tim 6b89460295 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-28 17:11:56 +08:00
Tim 37e29404ba 微信班级管理图标可点击区域放大 2016-07-28 17:11:46 +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
Tim 4bbd72ecd2 发送班级页面发送按钮定位 2016-07-28 14:58:19 +08:00
yuanke cf65e6748b 微信项目相关功能开发，班级角色功能等 2016-07-28 14:49:45 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
Tim 318ef2bb30 微信定位高度 2016-07-28 14:35:50 +08:00