 yuanke
|
52724bd9ed
|
KE ol ul标签增加margin-bottom:0
|
2016-05-18 15:11:53 +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
|
617649129e
|
Gemfile
|
2016-05-18 11:20:14 +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 |
|
yuanke
|
0ac7163b05
|
KE修改居中换行居中消失的问题
|
2016-05-17 15:55:24 +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 |
|
yuanke
|
93fb4441d8
|
代码测试改用新的提示框
|
2016-05-17 14:12:42 +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 |
|
huang
|
60b4639448
|
Merge branch 'develop' into hjq_beidou
|
2016-05-17 10:53:23 +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
|
f079d27622
|
Merge branch 'hjq_beidou' into develop
|
2016-05-17 09:03:16 +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
|
c15ef0b528
|
Merge branch 'develop' into hjq_beidou
|
2016-05-16 14:21:07 +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 |