 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 |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
2016-05-20 12:43:47 +08:00 |
|
cxt
|
82568b5951
|
缺陷状态更改或内容更改时不发模板消息
|
2016-05-20 11:39:30 +08:00 |
|
cxt
|
6aa20c9edf
|
消息通知的内容没有过滤用Tab键空格引起的特殊符号
|
2016-05-20 11:12:37 +08:00 |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
2016-05-20 10:48:17 +08:00 |
|
huang
|
92f55e0dc1
|
公共资源库，点击底部不能发送的问题
|
2016-05-20 10:02:59 +08:00 |
|
cxt
|
b03b9a3c27
|
课程：问卷导入时显示的数据未进行过滤
|
2016-05-20 09:59:41 +08:00 |
|
huang
|
f806dbf587
|
资源发送至组织和课程
|
2016-05-19 17:12:33 +08:00 |
|
huang
|
e0370e3e32
|
私有资源中发送文件
|
2016-05-19 17:04:46 +08:00 |
|
huang
|
1402f2076a
|
资源申请添加链接
|
2016-05-19 16:53:22 +08:00 |
|
yuanke
|
0dd7aae08c
|
先注释自动识别URL
|
2016-05-19 16:39:23 +08:00 |
|
cxt
|
df70c33bcd
|
学生列表活跃度为0
|
2016-05-19 16:39:14 +08:00 |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
2016-05-19 16:30:02 +08:00 |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-05-19 16:29:33 +08:00 |
|
yuanke
|
7da1418069
|
自动识别URL
|
2016-05-19 16:24:57 +08:00 |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
huang
|
984f706722
|
可发送权限控制
|
2016-05-19 15:59:59 +08:00 |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
2016-05-19 15:57:20 +08:00 |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
2016-05-19 15:26:23 +08:00 |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
2016-05-19 15:20:46 +08:00 |
|
cxt
|
05a475e47e
|
微信动态中不应出现已删除的项目和课程动态
|
2016-05-19 14:35:40 +08:00 |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
2016-05-19 14:28:13 +08:00 |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
2016-05-19 13:50:45 +08:00 |
|
huang
|
4c68da9bee
|
修正链接资源名
|
2016-05-19 13:49:29 +08:00 |
|
huang
|
bddc807057
|
修正资源库弹框位置
|
2016-05-19 13:41:32 +08:00 |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
2016-05-19 11:32:58 +08:00 |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
2016-05-18 17:37:48 +08:00 |
|
cxt
|
31d94dc052
|
发布可引用的作业至课程，作业的原作者不应收到微信消息提醒
|
2016-05-18 16:28:43 +08:00 |
|
yuanke
|
c208b79e2d
|
代码测试上面的语言右边 加上编译器信息
|
2016-05-18 16:23:28 +08:00 |
|
cxt
|
670b2c48c7
|
缺陷的模板消息要细化缺陷类型
|
2016-05-18 16:08:40 +08:00 |
|
cxt
|
3b3cafbc81
|
微信模板消息的还原
|
2016-05-18 14:49:49 +08:00 |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
2016-05-18 14:49:13 +08:00 |
|
yuanke
|
0e016eed2a
|
KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布
|
2016-05-18 14:15:39 +08:00 |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
2016-05-18 10:57:56 +08:00 |
|
huang
|
615d0ddbd2
|
公共资源、私有资源请求分享界面及样式
|
2016-05-17 16:45:11 +08:00 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
 guange
|
1767e1200d
|
school不用Base64解码，两边都是utf8
|
2016-05-17 15:56:06 +08:00 |
|
cxt
|
ddafa79835
|
无法展开隐藏楼层
|
2016-05-17 15:52:24 +08:00 |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
2016-05-17 15:33:16 +08:00 |
|
huang
|
07678e367e
|
资源新样式删除功能
|
2016-05-17 15:32:18 +08:00 |
|
huang
|
4c71e525a7
|
资源新样式增加后，重命名功能
|
2016-05-17 15:30:10 +08:00 |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
|
Tim
|
70ff3e2c19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 11:24:42 +08:00 |
|
Tim
|
0b2fe1d88a
|
分组作业样式
|
2016-05-17 11:24:29 +08:00 |
|
huang
|
0cba32ecd6
|
北斗单点登录引起的500问题
|
2016-05-17 11:23:20 +08:00 |
|
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 11:22:03 +08:00 |
|
huang
|
4c066f9ad3
|
初始化单点登录用户同步用户角色
|
2016-05-17 11:21:05 +08:00 |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
2016-05-17 10:31:10 +08:00 |
|
huang
|
11bc6b1e6c
|
配置500问题
|
2016-05-17 10:18:24 +08:00 |
|
huang
|
e9c35ae20f
|
组织未登录情况默认图片展示
|
2016-05-17 10:13:03 +08:00 |
|
huang
|
985b1e4c95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 10:06:17 +08:00 |
|
Tim
|
15ea9a9659
|
组织门户自动播放禁用
|
2016-05-17 10:04:23 +08:00 |
|
Tim
|
1402ae190d
|
组织头像
|
2016-05-17 10:03:26 +08:00 |
|
huang
|
20e8627b02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-17 09:52:51 +08:00 |
|
huang
|
326c3a84a0
|
还原域名问题
|
2016-05-17 09:52:26 +08:00 |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
2016-05-17 09:36:55 +08:00 |
|
Tim
|
aee56c7eca
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 09:15:05 +08:00 |
|
Tim
|
545e4ac380
|
禁用组织门户合作伙伴自动滚动效果
|
2016-05-17 09:11:30 +08:00 |
|
huang
|
b0f9d0280f
|
0
|
2016-05-17 09:06:38 +08:00 |
|
huang
|
855b33c4a5
|
Merge branch 'develop' into hjq_beidou
|
2016-05-17 09:02:43 +08:00 |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
2016-05-17 09:02:17 +08:00 |
|
Tim
|
e9a3bc5094
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-17 09:00:40 +08:00 |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
2016-05-16 18:08:05 +08:00 |
|
guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-16 17:44:32 +08:00 |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
2016-05-16 17:44:08 +08:00 |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
2016-05-16 17:02:18 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
cxt
|
9caf9cbf2f
|
消息列表的消息，在点击时，要弹出新的浏览器页面
|
2016-05-16 16:16:24 +08:00 |
|
Tim
|
fbbda96c60
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-16 15:00:21 +08:00 |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
2016-05-16 15:00:08 +08:00 |
|
huang
|
6cca44df98
|
组织项目、课程动态问题
|
2016-05-16 14:53:40 +08:00 |
|
huang
|
2484d642a1
|
组织500问题
|
2016-05-16 14:19:04 +08:00 |
|
huang
|
ff20b50aa2
|
Merge branch 'cxt_course' into develop
|
2016-05-16 11:15:01 +08:00 |
|
cxt
|
5e56e11982
|
暂时禁掉作业的模板消息和消息通知
|
2016-05-16 11:14:21 +08:00 |