 yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
yuanke
|
7c222373dc
|
修改获取用户关注公众号结果
|
2016-08-14 09:55:02 +08:00 |
|
yuanke
|
4eec1f5d4e
|
获取未关注修改
|
2016-08-14 09:50:43 +08:00 |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
2016-08-14 09:38:47 +08:00 |
 guange
|
ea85c0c608
|
.
|
2016-08-13 21:57:22 +08:00 |
|
yuanke
|
61680c6343
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 18:35:21 +08:00 |
|
yuanke
|
85b3df889c
|
修改微信获取课程大纲的代码
|
2016-08-13 18:35:11 +08:00 |
 huang
|
1f4f03d8ed
|
修改项目列表中的资源链接
|
2016-08-13 17:31:09 +08:00 |
 cxt
|
a4a0ef139b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 17:04:16 +08:00 |
|
cxt
|
1374444ec1
|
左侧项目列表的展开
|
2016-08-13 17:04:09 +08:00 |
|
huang
|
3ce088002a
|
留言和已关闭流程修改
|
2016-08-13 16:53:56 +08:00 |
|
huang
|
896e301b33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-13 16:43:14 +08:00 |
|
huang
|
966722b920
|
关闭和打开的时候显示root问题
|
2016-08-13 16:43:00 +08:00 |
 Tim
|
f67336fbe5
|
课程信息单词折行
|
2016-08-13 16:27:29 +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 |
|
cxt
|
f4e965c9fb
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-13 15:35:10 +08:00 |
|
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +08:00 |
|
guange
|
c9d32ca69b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 15:25:07 +08:00 |
|
guange
|
70d58ccf85
|
恢复授权页
|
2016-08-13 15:24:52 +08:00 |
|
huang
|
9003040d6a
|
版本库获取动态API修改
|
2016-08-13 14:42:24 +08:00 |
|
yuanke
|
e06f09406c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:41:46 +08:00 |
|
guange
|
dde0fbb3c1
|
迁移用户
|
2016-08-13 14:39:15 +08:00 |
|
huang
|
93f8ac31f1
|
项目资源库新分页及ajax刷新
|
2016-08-13 14:17:50 +08:00 |
|
yuanke
|
3a83b40a64
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-13 14:04:05 +08:00 |
|
yuanke
|
a979bd3d54
|
微信修改绑定成功的模版消息内容
|
2016-08-13 14:03:53 +08:00 |
|
guange
|
7b28d2d183
|
.
|
2016-08-13 13:57:27 +08:00 |
|
guange
|
fc74e714ee
|
.
|
2016-08-13 13:53:21 +08:00 |
|
huang
|
00f032816c
|
版本库获取方式修改
|
2016-08-13 13:48:23 +08:00 |
|
guange
|
a761bfe3f8
|
.
|
2016-08-13 11:37:37 +08:00 |
|
huang
|
37df983009
|
项目列表
|
2016-08-13 11:13:11 +08:00 |
|
guange
|
b9cf2527a4
|
merge
|
2016-08-13 11:11:24 +08:00 |
|
guange
|
3130296e69
|
修改微信个人信息获取实现
|
2016-08-13 11:09:48 +08:00 |
|
yuanke
|
852c7929b6
|
修改审批通知链接
|
2016-08-13 10:39:32 +08:00 |
|
huang
|
1b19d227f9
|
项目列表样式及连接
|
2016-08-13 10:17:38 +08:00 |
|
yuanke
|
88e23dca80
|
微信回复自动注册及获取微信昵称修改
|
2016-08-12 18:19:21 +08:00 |
|
yuanke
|
3051b82ac2
|
调试
|
2016-08-12 18:03:58 +08:00 |
|
yuanke
|
697e857806
|
调试
|
2016-08-12 18:00:09 +08:00 |
|
yuanke
|
e21f7a34bd
|
调试
|
2016-08-12 17:46:44 +08:00 |
|
yuanke
|
1a835a25db
|
调试
|
2016-08-12 17:38:24 +08:00 |
|
yuanke
|
9b52c1504e
|
调试
|
2016-08-12 17:33:45 +08:00 |
|
yuanke
|
2ff83aff81
|
调试
|
2016-08-12 17:30:48 +08:00 |
|
huang
|
ce9c2d3d06
|
搜索的时候分页刷新
|
2016-08-12 17:25:20 +08:00 |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
2016-08-12 17:14:18 +08:00 |
|
huang
|
047eea125d
|
课程资源分页及局部刷新
|
2016-08-12 17:05:46 +08:00 |
|
yuanke
|
bd12ea169d
|
调试
|
2016-08-12 16:58:48 +08:00 |
|
yuanke
|
5b208202a0
|
调试
|
2016-08-12 15:38:17 +08:00 |
|
yuanke
|
ae437912d8
|
调试
|
2016-08-12 15:06:28 +08:00 |
|
yuanke
|
ae13435de6
|
调试
|
2016-08-12 14:47:54 +08:00 |
|
yuanke
|
d60857eaea
|
调试
|
2016-08-12 14:41:56 +08:00 |
|
yuanke
|
9fcb43b949
|
调试
|
2016-08-12 14:29:19 +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 |
|
huang
|
7efc8ccac6
|
新建项目，增加项目名称输入例
|
2016-08-12 14:11:15 +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
|
e4194288ce
|
微信获取用户信息修改
|
2016-08-12 10:59:12 +08:00 |
|
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
2016-08-12 10:40:36 +08:00 |
|
cxt
|
85cd113cf9
|
日志修改
|
2016-08-12 10:20:58 +08:00 |
|
yuanke
|
64eacc2d5e
|
微信默认注册修改
|
2016-08-12 10:10:10 +08:00 |
|
yuanke
|
6af15b7121
|
微信自动绑定用户修改
|
2016-08-12 09:23:09 +08:00 |
|
yuanke
|
3a000a360a
|
appid 修改
|
2016-08-11 17:30:06 +08:00 |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
2016-08-11 17:22:48 +08:00 |
|
cxt
|
03c093fb13
|
班级作业列表中“赞”和“取消点赞”不可用
|
2016-08-11 16:34:00 +08:00 |
|
cxt
|
4a25b6357b
|
我的作业报500
|
2016-08-11 16:12:48 +08:00 |
|
cxt
|
951390092b
|
我的作业报500
|
2016-08-11 15:59:38 +08:00 |
|
cxt
|
322868f063
|
班级的课程id变为空时打印日志
|
2016-08-11 15:58:49 +08:00 |
|
huang
|
8eaeea299a
|
相同分支和项目消息JS提示
|
2016-08-11 15:19:58 +08:00 |
|
yuanke
|
03551dfba9
|
项目申请BUG修改
|
2016-08-11 15:19:47 +08:00 |
|
yuanke
|
96bc405a19
|
修改项目申请相关BUG
|
2016-08-11 15:06:32 +08:00 |
|
cxt
|
80b8fc4444
|
“我的作业”中有挂起的作业时会报500
|
2016-08-11 14:44:43 +08:00 |
|
huang
|
3df8a46634
|
PUll request代码简化及reverse评论
|
2016-08-11 14:16:13 +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
|
72a7a1e9f2
|
已是项目成员则之前的申请都改为拒绝
|
2016-08-11 11:13:37 +08:00 |
|
huang
|
41ad5ca444
|
修改Gitlab接口返回创建时间
|
2016-08-11 11:11:49 +08:00 |
|
yuanke
|
b8155cc1c2
|
班级通知修改
|
2016-08-11 11:05:19 +08:00 |
|
Tim
|
f4445619d2
|
题库预览弹框样式调整
|
2016-08-11 11:02:40 +08:00 |
|
yuanke
|
f100d3ebea
|
项目发起人显示名称修改
|
2016-08-11 11:00:52 +08:00 |
|
yuanke
|
a1dfdae58d
|
修改班级通知模版消息的跳转
|
2016-08-11 10:54:14 +08:00 |
|
huang
|
a9942fd4b3
|
change integer to A
|
2016-08-11 10:48:48 +08:00 |
|
Tim
|
59a76c3b9a
|
调整组织上传资源弹窗位置
|
2016-08-11 10:47:22 +08:00 |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
2016-08-11 10:33:22 +08:00 |
|
cxt
|
bae0562b97
|
适用专业和先修课程的换行显示
|
2016-08-11 10:32:57 +08:00 |
|
cxt
|
9b8470b813
|
编辑分组作业后点确定，原来设置的基于项目实施会被取消
|
2016-08-11 10:23:44 +08:00 |
|
huang
|
88e35c7431
|
quality list
|
2016-08-11 10:02:59 +08:00 |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
2016-08-11 09:58:45 +08:00 |
|
huang
|
1605ef601c
|
conflict
|
2016-08-11 09:50:20 +08:00 |
|
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
2016-08-11 09:48:29 +08:00 |
|
huang
|
b14cdb0b6d
|
some log
|
2016-08-11 09:47:49 +08:00 |
|
cxt
|
d99348c245
|
测验描述超出边框
|
2016-08-11 09:46:41 +08:00 |
|
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-10 17:19:42 +08:00 |
|
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
2016-08-10 17:19:32 +08:00 |
|
huang
|
b046f24b44
|
合并信息提交
|
2016-08-10 16:54:58 +08:00 |
|
cxt
|
7edb30754b
|
student_works添加字段commit_time，记录学生作品实际的提交时间
|
2016-08-10 16:50:27 +08:00 |
|
huang
|
98a8702ba6
|
记录谁合并的pull request请求
|
2016-08-10 16:49:48 +08:00 |