 cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
 yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
2016-09-01 14:11:20 +08:00 |
 huang
|
9e9b4d12c9
|
新注册用户不发送留言
|
2016-08-31 15:00:34 +08:00 |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
2016-08-31 14:21:38 +08:00 |
|
huang
|
4320fbf945
|
Merge branch 'dev_blankdatabase' into develop
|
2016-08-31 10:30:46 +08:00 |
|
cxt
|
188b9197aa
|
消息列表
|
2016-08-30 16:15:57 +08:00 |
|
huang
|
6d0f22fd60
|
空数据库--修复后台删除issue标签500问题
|
2016-08-30 16:03:28 +08:00 |
|
yuanke
|
b9e9892257
|
微信issue指向BUG修改，issue@功能修改
|
2016-08-30 15:01:26 +08:00 |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
2016-08-30 14:25:36 +08:00 |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
2016-08-30 14:08:10 +08:00 |
|
cxt
|
0047f7bfdf
|
学生身份的编辑
|
2016-08-26 19:39:41 +08:00 |
|
cxt
|
0ce61bfee8
|
学生删除作品时将作品还原为初始状态
|
2016-08-26 16:20:14 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
yuanke
|
f50cfe159c
|
微信用户合并修改
|
2016-08-14 12:35:03 +08:00 |
|
yuanke
|
3be75c8633
|
微信BUG修改
|
2016-08-14 11:18:23 +08:00 |
 guange
|
1d53af36cd
|
merge
|
2016-08-14 11:16:20 +08:00 |
|
guange
|
dc7ff8f90f
|
.
|
2016-08-14 11:15:37 +08:00 |
|
yuanke
|
6cea0bfb67
|
.
|
2016-08-14 10:56:38 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 15:39:06 +08:00 |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-08-13 15:36:48 +08:00 |
|
guange
|
dde0fbb3c1
|
迁移用户
|
2016-08-13 14:39:15 +08:00 |
|
guange
|
7b28d2d183
|
.
|
2016-08-13 13:57:27 +08:00 |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
2016-08-12 17:14:18 +08:00 |
|
cxt
|
85cd113cf9
|
日志修改
|
2016-08-12 10:20:58 +08:00 |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
|
cxt
|
322868f063
|
班级的课程id变为空时打印日志
|
2016-08-11 15:58:49 +08:00 |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
2016-08-11 11:19:52 +08:00 |
|
yuanke
|
b8155cc1c2
|
班级通知修改
|
2016-08-11 11:05:19 +08:00 |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
2016-08-10 16:50:27 +08:00 |
|
huang
|
5ad063b830
|
记录接受PR用户信息，并且唯一性判断
|
2016-08-10 16:27:41 +08:00 |
 Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
2016-08-10 15:37:08 +08:00 |
|
huang
|
1588f5cfca
|
开发环境下不启动elastic
|
2016-08-09 16:31:14 +08:00 |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
2016-08-09 09:23:06 +08:00 |
|
cxt
|
5b8883960b
|
Merge branch 'cxt_course' into develop
|
2016-08-05 18:52:09 +08:00 |
|
cxt
|
f5a2d6acdb
|
班级作品：学生提交作品弹出作品校验框，点击重试后，作品列表中默认生成的作品记录就没有了
|
2016-08-05 17:33:31 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +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 |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
2016-08-04 15:32:25 +08:00 |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
2016-08-03 14:55:54 +08:00 |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
2016-08-03 09:37:24 +08:00 |
|
yuanke
|
a4281b4934
|
Merge branch 'develop' into weixin_guange
|
2016-08-02 15:51:29 +08:00 |
 daiao
|
fc1fc0bd7d
|
单位审核bug修复
|
2016-08-01 15:44:18 +08:00 |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
2016-08-01 13:54:10 +08:00 |
|
huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
2016-08-01 13:51:11 +08:00 |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
2016-08-01 11:14:03 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |
|
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
2016-07-29 21:45:52 +08:00 |