 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 |
|
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 |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
2016-05-13 18:10:33 +08:00 |
|
huang
|
b9e5c77b91
|
资源500问题
|
2016-05-13 18:02:06 +08:00 |
|
Tim
|
187bd61026
|
pull代码
|
2016-05-13 17:59:58 +08:00 |
|
cxt
|
695e870a26
|
作品的统计不见了
|
2016-05-13 17:30:05 +08:00 |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
2016-05-13 17:26:17 +08:00 |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
2016-05-13 17:24:12 +08:00 |
|
huang
|
fbcae050ad
|
项目500问题
|
2016-05-13 17:16:09 +08:00 |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
2016-05-13 17:11:53 +08:00 |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
2016-05-13 17:00:25 +08:00 |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
2016-05-13 16:59:59 +08:00 |
|
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 16:57:39 +08:00 |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
2016-05-13 16:56:02 +08:00 |