Commit Graph

16032 Commits

Author SHA1 Message Date
yuanke a66ecf6c28 修改图片地址 2016-08-26 16:18:57 +08:00
yuanke 2a6321cd9e 发布帖子标题长度改为128 2016-08-26 14:03:09 +08:00
yuanke 82779c99ea 字符串去掉空白时,空格不去掉。 2016-08-26 09:59:00 +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 6abdb47ec5 模版消息标点 2016-08-25 11:25:51 +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
yuanke f35c3e8528 微信新闻、issue增加二级回复等 2016-08-25 09:45:23 +08:00
huang 799c451921 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-25 09:20:46 +08:00
cxt 21c48ea383 at所有人 2016-08-24 17:46:18 +08:00
huang 80c6132ba5 Merge branch 'rep_quality' into develop 2016-08-24 17:39:44 +08:00
huang 7493de1334 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 17:38:40 +08:00
huang 0cc59260cd modified sonar list form of language 2016-08-24 17:35:04 +08:00
huang 8cc60ef1e8 delete some language of quality_analysis 2016-08-24 17:28:55 +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 ea7f65308e at所有人后不应带有用户登录名 2016-08-24 16:02:02 +08:00
daiao a3ec35c008 个人主页报500 2016-08-24 15:56:03 +08:00
huang f0ed380002 Merge branch 'rep_quality' into develop 2016-08-24 15:13:37 +08:00
huang ba6d0e6926 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-24 15:13:00 +08:00
huang bafb3e98a7 tip for sonar results 2016-08-24 15:05:10 +08:00
daiao 90803fbb2a Merge branch 'dev_shcool' into develop 2016-08-24 14:53:31 +08:00
daiao 8b0c0925dd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/layouts/new_base_user.html.erb
2016-08-24 14:52:10 +08:00
daiao 078900088a 修复:新建组织关联trustie-forge项目,点击组织动态的论坛动态报500 2016-08-24 14:41:26 +08:00
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
yuanke 0eb1c1a392 微信审核链接修改 2016-08-24 09:45:18 +08:00
yuanke 2e1e9391b6 微信审核链接路径修改 2016-08-24 09:39:41 +08:00
cxt 5d5bd88c88 个人主页:用户不应有修改他人头像的权限 2016-08-24 09:30:57 +08:00
yuanke e0ab93b739 微信审核路径修改 2016-08-24 09:30:28 +08:00
yuanke 3af5bc5813 微信审核修改 2016-08-23 17:42:48 +08:00
yuanke c5cedbfcc2 修改班级和项目审核模版消息地址 2016-08-23 17:37:23 +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
daiao 5088770214 修复:文章附件和资源栏目下载权限一致 2016-08-23 16:34:11 +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