 guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-05-05 14:07:29 +08:00 |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
2016-05-05 14:06:47 +08:00 |
 huang
|
6d28d0becd
|
二级域名的删除功能
|
2016-05-05 12:27:35 +08:00 |
 cxt
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
2016-05-05 11:34:31 +08:00 |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
2016-05-05 11:28:28 +08:00 |
|
cxt
|
f4cb6f120c
|
名片中的取消关注和添加关注
|
2016-05-05 11:09:53 +08:00 |
|
huang
|
5f696fe123
|
添加二级域名局部刷新
|
2016-05-05 11:06:11 +08:00 |
|
huang
|
36e6d44ac1
|
二级目录新建的时候暂时隐藏资源
|
2016-05-05 11:01:02 +08:00 |
|
cxt
|
5f50ad046c
|
留言报500
|
2016-05-05 10:52:54 +08:00 |
 Tim
|
71b70cf937
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-05 10:36:30 +08:00 |
|
Tim
|
9536f87c26
|
标题多行控制
|
2016-05-05 10:36:18 +08:00 |
|
huang
|
72e19b8b67
|
完成左中板块内容空白的配置
|
2016-05-05 10:36:17 +08:00 |
|
huang
|
159728c3ba
|
模式二为空的时候显示情况
|
2016-05-05 10:20:31 +08:00 |
|
huang
|
a0ea2c7e5d
|
模式二3在配置整合
|
2016-05-05 10:05:53 +08:00 |
|
huang
|
18dff4f8a3
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-05 09:45:53 +08:00 |
|
huang
|
aaf97ac81c
|
新版块3和板块2合并，板块3取前四个
|
2016-05-05 09:45:34 +08:00 |
|
cxt
|
d845b14992
|
讨论区的模板消息
|
2016-05-05 09:36:45 +08:00 |
|
Tim
|
c3514f5b6a
|
二级栏目名长度控制
|
2016-05-05 09:28:49 +08:00 |
|
cxt
|
bd22364f0a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-05 09:13:36 +08:00 |
|
cxt
|
2efe80c520
|
commit
|
2016-05-05 09:13:31 +08:00 |
|
cxt
|
5e8c749715
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-05 09:09:56 +08:00 |
|
cxt
|
121aca7505
|
缺陷模板消息
|
2016-05-05 09:09:45 +08:00 |
|
Tim
|
787dbaaffc
|
二维码处文字样式处理
|
2016-05-05 09:08:01 +08:00 |
|
huang
|
06e90c83e4
|
二级目录不进行排列定制和域名申请
|
2016-05-04 20:12:09 +08:00 |
|
huang
|
ccea42cc8b
|
项目和课程的动态只参与五种配置
|
2016-05-04 19:47:44 +08:00 |
|
huang
|
f94a45c398
|
完成模块8没内容显示
|
2016-05-04 19:40:48 +08:00 |
|
huang
|
d75f39cd81
|
模式7空白内容显示
|
2016-05-04 19:36:30 +08:00 |
|
huang
|
d86fec6f03
|
模式6没有内容的显示
|
2016-05-04 19:30:01 +08:00 |
|
huang
|
33bf4fafa6
|
模式4没有内容的显示情况
|
2016-05-04 19:12:53 +08:00 |
|
huang
|
04b2aee166
|
板块一没有图片的显示情况
|
2016-05-04 18:50:25 +08:00 |
|
guange
|
df41f7328f
|
json解析换成rails的
|
2016-05-04 17:25:24 +08:00 |
|
huang
|
2996daef71
|
二级域名局部刷新
|
2016-05-04 17:06:32 +08:00 |
|
Tim
|
6098e47ffe
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-04 16:54:14 +08:00 |
|
guange
|
eaad006d17
|
safe base64
|
2016-05-04 16:54:12 +08:00 |
|
Tim
|
abbbe9b7d6
|
二级子目录样式处理
|
2016-05-04 16:53:59 +08:00 |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
2016-05-04 16:43:37 +08:00 |
|
guange
|
e9834f108a
|
修改pwd
|
2016-05-04 16:35:39 +08:00 |
|
guange
|
250ed8c981
|
添加key
|
2016-05-04 16:33:56 +08:00 |
 yuanke
|
9dc92fe817
|
列表优化
|
2016-05-04 16:28:40 +08:00 |
|
cxt
|
71dcedc443
|
取消作品评分的缺省评分
|
2016-05-04 16:24:42 +08:00 |
|
guange
|
ff23df4f12
|
oss之前不用检验登录
|
2016-05-04 16:21:53 +08:00 |
|
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
|
huang
|
c32479270c
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-04 15:51:07 +08:00 |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
2016-05-04 15:50:53 +08:00 |
|
Tim
|
c7ea675e7d
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-04 15:44:17 +08:00 |
|
Tim
|
51ff1b0aa6
|
滚动栏效果调整
|
2016-05-04 15:43:46 +08:00 |
|
guange
|
e8adcf8cc7
|
添加sso model
|
2016-05-04 15:40:18 +08:00 |
|
huang
|
a691fb7eb7
|
添加或者取消提交时候弹框自动消失
|
2016-05-04 15:19:26 +08:00 |
|
huang
|
65a907bc99
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-05-04 15:06:20 +08:00 |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
2016-05-04 15:05:54 +08:00 |