 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 |
 Linda
|
cbec7cc8f8
|
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 14:41:54 +08:00 |
|
Linda
|
0fc142d822
|
组织配置logo样式
|
2016-05-04 14:40:25 +08:00 |
 Tim
|
80ff421853
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-04 14:09:20 +08:00 |
|
Tim
|
714deebe21
|
二级导航调整
|
2016-05-04 14:08:57 +08:00 |
|
guange
|
0635c1e98b
|
添加单点登录controller
|
2016-05-04 14:05:46 +08:00 |
|
huang
|
efb91abfb0
|
分页不跳转问题
|
2016-05-04 14:03:18 +08:00 |
|
huang
|
c0acaab404
|
首页logo上传图片
|
2016-05-04 13:55:27 +08:00 |
|
huang
|
f8ba77dc20
|
banner点击添加图片
|
2016-05-04 11:32:11 +08:00 |
|
huang
|
daa154db02
|
鼠标经过字母录显示结构
|
2016-05-04 11:16:25 +08:00 |
 cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
2016-05-04 11:13:52 +08:00 |
|
huang
|
578982faba
|
subdomain 404跳转
|
2016-05-04 11:08:16 +08:00 |
|
huang
|
7fbf6f4011
|
模式二帖子列表添加分页
|
2016-05-04 11:04:41 +08:00 |
 yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
2016-05-04 11:03:08 +08:00 |
|
cxt
|
ff160ff793
|
题库的申请改为绿色按钮
|
2016-05-04 10:15:22 +08:00 |
|
huang
|
fd543828ac
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/sub_document_comments_controller.rb
app/views/sub_document_comments/_show_newstyle.html.erb
app/views/sub_document_comments/show.html.erb
|
2016-05-04 09:46:26 +08:00 |
|
huang
|
557e731343
|
模式二添加回复功能，模式一回复超过三行则隐藏
|
2016-05-04 09:45:02 +08:00 |
|
Tim
|
765d52a2ce
|
详情页面格式调整
|
2016-05-04 09:40:20 +08:00 |
|
cxt
|
70910c5238
|
“我的作业”中不应出现已删除课程的作业
|
2016-05-04 09:40:18 +08:00 |
|
Tim
|
399f757811
|
0
|
2016-05-04 09:01:51 +08:00 |
|
huang
|
39dd62580a
|
完成2级目录详情页面
|
2016-05-03 20:08:40 +08:00 |
|
huang
|
a9059c4c2e
|
帖子添加编辑删除功能
|
2016-05-03 19:32:38 +08:00 |
|
yuanke
|
afd176b805
|
课程项目按更新时间排序
|
2016-05-03 19:10:04 +08:00 |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
2016-05-03 19:03:28 +08:00 |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
2016-05-03 18:17:54 +08:00 |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
2016-05-03 18:17:03 +08:00 |
|
cxt
|
d3e3e9d22b
|
补交作品的样式
|
2016-05-03 18:15:40 +08:00 |
|
cxt
|
407af62654
|
作业动态的分数显示
|
2016-05-03 18:06:53 +08:00 |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
2016-05-03 17:57:24 +08:00 |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
2016-05-03 17:23:56 +08:00 |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
2016-05-03 17:11:30 +08:00 |
|
huang
|
0e46d0ac27
|
二级域名中帖子回复功能
|
2016-05-03 17:11:08 +08:00 |
|
huang
|
5fb5a2e8bc
|
二级域名帖子列表两种形式区分
|
2016-05-03 16:49:13 +08:00 |
|
yuanke
|
96e7c9d134
|
新闻排序时间改为更新时间
|
2016-05-03 16:34:31 +08:00 |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |
|
cxt
|
55297a9daf
|
统一作业动态中项目的更新时间与tip中的更新时间
|
2016-05-03 15:19:22 +08:00 |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
2016-05-03 15:12:56 +08:00 |
|
huang
|
6635ded1e8
|
组织base中添加二级域名
|
2016-05-03 14:55:08 +08:00 |
|
yuanke
|
5f24fb6496
|
锁的样式修改
|
2016-05-03 14:40:33 +08:00 |
|
yuanke
|
2468010125
|
课程、项目列表修改
|
2016-05-03 14:30:35 +08:00 |
|
cxt
|
8ccedaa622
|
通知详情添加点赞
|
2016-05-03 14:13:01 +08:00 |
|
cxt
|
14a539bd0a
|
样式冲突
|
2016-05-03 11:40:24 +08:00 |
|
huang
|
517db8f105
|
组织二级域名弹框
|
2016-05-03 11:24:39 +08:00 |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
2016-05-03 11:24:16 +08:00 |