Commit Graph

4663 Commits

Author SHA1 Message Date
yuanke a979bd3d54 微信修改绑定成功的模版消息内容 2016-08-13 14:03:53 +08:00
yuanke 9b52c1504e 调试 2016-08-12 17:33:45 +08:00
yuanke 2ff83aff81 调试 2016-08-12 17:30:48 +08:00
yuanke d60857eaea 调试 2016-08-12 14:41:56 +08:00
yuanke 1f8ea39765 调试 2016-08-12 14:25:45 +08:00
yuanke 2cfd876f2f 调试 2016-08-12 14:17:50 +08:00
yuanke c307f7769f 调试 2016-08-12 14:13:53 +08:00
yuanke ded55ca022 调试 2016-08-12 14:08:27 +08:00
yuanke fd036d758e 调试 2016-08-12 13:50:44 +08:00
yuanke bce3513424 分享修改 2016-08-12 12:09:20 +08:00
yuanke 24a0bfea77 分享修改 2016-08-12 12:05:14 +08:00
yuanke 822ca15c78 分享修改 2016-08-12 11:34:09 +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 14e70541db 平台加入项目发微信模版消息 2016-08-11 11:22:42 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke f100d3ebea 项目发起人显示名称修改 2016-08-11 11:00:52 +08:00
yuanke 0d69fa0cc0 微信私有动态内容加上提示 2016-08-11 10:33:22 +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 9594aada50 Merge branch 'cxt_course' into develop
Conflicts:
	public/javascripts/application.js
2016-08-09 16:42:23 +08:00
cxt a3011c319b 我的题库显示我的所有作业 2016-08-09 16:40:56 +08:00
cxt 65f6b0fc70 新建课程报500 2016-08-09 15:50:23 +08:00
cxt 739edd68bf Merge branch 'cxt_course' into develop 2016-08-09 15:24:07 +08:00
cxt c891a41ef1 打印log 2016-08-09 15:23:21 +08:00
cxt 547aae0743 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-09 10:40:25 +08:00
cxt 6c9a4a6620 首页的左侧项目栏无法展开 2016-08-09 10:38:44 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
huang ecc6f5601e 接受请求后显示admin问题 2016-08-05 20:14:19 +08:00
cxt 5b8883960b Merge branch 'cxt_course' into develop 2016-08-05 18:52:09 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”,而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
cxt 55637808ff 班级作品:两种角色的成员,先学生身份提交作品,再教辅身份评阅自己的作品,评阅结果不能自动刷新 2016-08-05 18:07:54 +08:00
cxt f5a2d6acdb 班级作品:学生提交作品弹出作品校验框,点击重试后,作品列表中默认生成的作品记录就没有了 2016-08-05 17:33:31 +08:00
huang 3afdeda4d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 16:42:44 +08:00
huang 3ef2509d27 报告人员加入项目不用提醒 2016-08-05 16:35:22 +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
daiao 7fbca5f260 单位审查消息及其BUG修复 2016-08-05 16:14:26 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 43a4e0a2bf fork成功不跳转提示 2016-08-05 15:23:52 +08:00
huang b62ac02c15 自身分支创建PR修改 2016-08-05 14:19:09 +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
cxt f9bfe278c0 多重身份的学生匿评变为了教辅评分 2016-08-05 10:03:47 +08:00
huang ab6acb460e forke项目发送pull request API 2016-08-04 19:32:44 +08:00
huang f4bda16469 fork分支PR 2016-08-04 18:30:04 +08:00
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题) 2016-08-04 17:01:19 +08:00