cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
2016-05-26 15:32:00 +08:00 |
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
2016-05-26 15:27:31 +08:00 |
guange
|
b48b1c97b3
|
weixin
|
2016-05-26 13:02:27 +08:00 |
guange
|
e4653426d2
|
将openid存到session
|
2016-05-26 12:59:15 +08:00 |
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能,修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
2016-05-25 16:20:01 +08:00 |
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-25 15:27:00 +08:00 |
cxt
|
09b831c189
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 14:57:59 +08:00 |
cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
huang
|
457cf72263
|
断行样式
发送JS
|
2016-05-25 14:08:05 +08:00 |
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
huang
|
72ae31b7f9
|
作业导出资源代码回复
|
2016-05-25 11:23:19 +08:00 |
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
huang
|
2abb68c00c
|
组织代码公共部分整理
|
2016-05-25 10:54:49 +08:00 |
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
2016-05-24 19:52:51 +08:00 |
cxt
|
4ec0d6812b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 18:11:18 +08:00 |
huang
|
909d40b4eb
|
默认显示公共资源
|
2016-05-24 17:14:01 +08:00 |
cxt
|
fc3b47e3aa
|
测验统计结果的js问题
|
2016-05-24 16:37:21 +08:00 |
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
2016-05-24 16:12:27 +08:00 |
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
Tim
|
1c0a68e57b
|
组织配置成员tab,搜索结果太多导致换页断行问题
|
2016-05-24 15:47:22 +08:00 |
Tim
|
65c7719ed2
|
设置大纲图标在讨论区换行显示问题
|
2016-05-24 15:18:11 +08:00 |
cxt
|
ccf29c980a
|
作业列表搜索作业:搜索结果中包括不包含关键字的作业、作业回复框加载不出
|
2016-05-24 10:34:36 +08:00 |
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
cxt
|
6af9e849d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 09:51:45 +08:00 |
cxt
|
13676ec9c3
|
微信的链接修改
|
2016-05-24 09:51:27 +08:00 |
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
2016-05-24 09:11:50 +08:00 |
huang
|
b1c70db28a
|
上线暂时还原代码
|
2016-05-23 16:34:31 +08:00 |
cxt
|
e62a4cc646
|
绑定新的微信公众号
|
2016-05-23 16:29:38 +08:00 |
huang
|
0e03798f6e
|
组织框架结构(yeild)修改
|
2016-05-23 16:24:32 +08:00 |
huang
|
a3abf09841
|
delayjob封装
|
2016-05-23 16:04:06 +08:00 |
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |
huang
|
d70f42b413
|
发布课程通知消息异步发送(测试版)
|
2016-05-23 15:03:22 +08:00 |
cxt
|
6586dfaf91
|
作品搜索时,复制的姓名或学号或邮箱因为包含空格,而搜索不到相关结果
|
2016-05-23 14:47:10 +08:00 |
cxt
|
2afce9d563
|
隐藏导入作业的申请题库
|
2016-05-23 14:05:28 +08:00 |
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
2016-05-23 10:53:49 +08:00 |
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
2016-05-23 09:51:59 +08:00 |
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
2016-05-20 22:08:45 +08:00 |
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 22:08:32 +08:00 |
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
Tim
|
51cd9c6dd1
|
学号溢出bug
|
2016-05-20 21:47:31 +08:00 |
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |
huang
|
e512154ea9
|
古剑删除描述一致
|
2016-05-20 21:00:36 +08:00 |
huang
|
d9241d5dca
|
组织栏目帖子设为首页后显示在栏目中
|
2016-05-20 20:55:43 +08:00 |
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
huang
|
166a97dc0c
|
注释
|
2016-05-20 20:37:11 +08:00 |
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
2016-05-20 20:31:39 +08:00 |
huang
|
90bb940290
|
资源下载链接问题
|
2016-05-20 20:27:32 +08:00 |
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
Tim
|
5f4a9304fe
|
提交成绩后,列表成绩没刷新修改;分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
huang
|
3ffe131a73
|
删除的提示
|
2016-05-20 20:02:17 +08:00 |
huang
|
f308b24f5a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:52:57 +08:00 |
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
2016-05-20 19:52:42 +08:00 |
Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
2016-05-20 19:13:55 +08:00 |
cxt
|
40f45ea697
|
发布通知的微信模板消息内容有重复
|
2016-05-20 19:13:19 +08:00 |
cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:11:16 +08:00 |
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
2016-05-20 19:11:09 +08:00 |
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
2016-05-20 18:59:54 +08:00 |
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
2016-05-20 18:55:17 +08:00 |
huang
|
e901becfe6
|
发送权限问题
|
2016-05-20 18:46:19 +08:00 |
yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
2016-05-20 18:43:20 +08:00 |
yuanke
|
bc8171501d
|
解决组织文章设为首页报500
|
2016-05-20 18:40:39 +08:00 |
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
2016-05-20 17:40:18 +08:00 |
yuanke
|
0e827abd35
|
将代码测试编译器信息的冒号改为中文的
|
2016-05-20 17:25:56 +08:00 |
huang
|
82f4c685da
|
消息拒绝问题
|
2016-05-20 17:11:44 +08:00 |
huang
|
18054dd96d
|
私有资源不能下载
|
2016-05-20 17:04:20 +08:00 |
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
2016-05-20 16:38:58 +08:00 |
cxt
|
6479ace5e1
|
作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制
|
2016-05-20 16:19:10 +08:00 |
cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:37 +08:00 |
cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:16 +08:00 |
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空,截止时间和发布时间不应显示
|
2016-05-20 15:39:07 +08:00 |
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +08:00 |
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:37:02 +08:00 |
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:36:00 +08:00 |
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
huang
|
5114c12c17
|
注释掉为完成的代码
|
2016-05-20 15:34:35 +08:00 |
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
huang
|
dddd7e0ea2
|
下载
|
2016-05-20 15:28:09 +08:00 |
Tim
|
c3f63709ed
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:15:56 +08:00 |
Tim
|
13f83719c1
|
作品列表改为table布局
|
2016-05-20 15:15:42 +08:00 |
huang
|
b1e0618742
|
导入资源不能用的问题
|
2016-05-20 15:05:04 +08:00 |
cxt
|
c165d0b37e
|
作业二级回复的模板通知
|
2016-05-20 14:52:47 +08:00 |
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
2016-05-20 14:28:14 +08:00 |
huang
|
004c48b456
|
发送至课程项目局部刷新
|
2016-05-20 14:16:45 +08:00 |
huang
|
352b40dd96
|
默认为“公共资源”
|
2016-05-20 13:52:39 +08:00 |
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
2016-05-20 13:37:18 +08:00 |