 Tim
|
d14a462f2b
|
替换css文件源，css样式修改
|
2016-06-23 17:28:21 +08:00 |
|
Tim
|
9cd1630651
|
优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换
|
2016-06-16 08:52:13 +08:00 |
|
Tim
|
e1d4e35ea6
|
pull
|
2016-06-15 14:17:31 +08:00 |
|
Tim
|
0e95295570
|
pull code
|
2016-05-19 09:24:12 +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
|
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 |
|
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 |
|
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 |
|
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 |
 cxt
|
5e56e11982
|
暂时禁掉作业的模板消息和消息通知
|
2016-05-16 11:14:21 +08:00 |
|
huang
|
9088d11fed
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-16 11:14:12 +08:00 |
|
huang
|
9f02ff57fc
|
Merge branch 'develop' into hjq_beidou
|
2016-05-16 10:48:27 +08:00 |
|
huang
|
09c462ebad
|
资源代码还原
|
2016-05-15 08:50:10 +08:00 |
 yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
2016-05-15 00:02:49 +08:00 |
|
yuanke
|
e24470db4c
|
代码测试截取ERROR_MSG时只在编译错误下截取
|
2016-05-15 00:00:16 +08:00 |
|
guange
|
5dff3556fb
|
配置出错
|
2016-05-14 16:46:27 +08:00 |
|
guange
|
c96ae60d24
|
Merge branch 'guange_dev' into develop
|
2016-05-14 16:02:28 +08:00 |
|
guange
|
b681e3a597
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-14 16:02:11 +08:00 |
|
guange
|
f217b3f510
|
去除用户名域名
|
2016-05-14 16:00:04 +08:00 |
|
guange
|
8411a08ddb
|
修改错别字
|
2016-05-14 09:43:01 +08:00 |
|
cxt
|
baaff3f988
|
数据迁移
|
2016-05-13 20:12:56 +08:00 |
|
cxt
|
c25b63a254
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 20:07:49 +08:00 |
|
cxt
|
90a9472e30
|
删除空数据
|
2016-05-13 20:07:43 +08:00 |
|
huang
|
0fdff7a183
|
Merge branch 'yuanke' into develop
|
2016-05-13 20:02:45 +08:00 |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-05-13 20:02:32 +08:00 |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
2016-05-13 20:01:45 +08:00 |
|
huang
|
aef178183c
|
我的资源附件不能删的问题
|
2016-05-13 19:41:07 +08:00 |
|
yuanke
|
6056505f96
|
复制粘贴时将图片所带链接删掉
|
2016-05-13 19:07:36 +08:00 |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:28:07 +08:00 |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
2016-05-13 18:26:01 +08:00 |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:12:12 +08:00 |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
2016-05-13 18:12:06 +08:00 |