 Tim
|
c8da24b6bc
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-05-05 16:21:01 +08:00 |
|
Tim
|
d0f97275cc
|
组织二级栏目显隐效果
|
2016-05-05 16:20:49 +08:00 |
 huang
|
e0c011948c
|
二级域名的隐藏和显示
|
2016-05-05 15:16:14 +08:00 |
 cxt
|
29c18518e7
|
教师有权限删除课程内教辅和学生上传的资源的TAG
|
2016-05-05 15:04:37 +08:00 |
 yuanke
|
b82a1c1162
|
讨论区计算回复数的一个BUG
|
2016-05-05 14:52:58 +08:00 |
 guange
|
72f5f5b795
|
加入组织
|
2016-05-05 14:52:10 +08:00 |
|
huang
|
79cd36f297
|
二级域名排序
|
2016-05-05 14:39:27 +08:00 |
|
guange
|
17282083a6
|
merge
|
2016-05-05 14:07:37 +08:00 |
|
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
|
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 |
|
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 |
 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
|
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 |
|
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
|
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 |
|
cxt
|
151661830f
|
微信模板消息的样式
|
2016-05-03 11:03:34 +08:00 |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
2016-05-03 10:58:49 +08:00 |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
2016-05-03 10:15:09 +08:00 |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
2016-04-29 20:45:14 +08:00 |
|
cxt
|
1cad1626e0
|
解决冲突
|
2016-04-29 20:31:31 +08:00 |
|
cxt
|
2ca77d26b6
|
作业列表报500
|
2016-04-29 19:49:09 +08:00 |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
2016-04-29 19:24:20 +08:00 |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 19:22:08 +08:00 |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
2016-04-29 17:55:57 +08:00 |
|
huang
|
14335d5da3
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
|
2016-04-29 17:14:12 +08:00 |
|
huang
|
90a285b35e
|
base中添加二级目录
|
2016-04-29 17:13:09 +08:00 |
|
Tim
|
56a4a64d09
|
北斗详情翻页更改；位置超出省略号
|
2016-04-29 17:09:15 +08:00 |
|
cxt
|
8f3b9ae9fe
|
动态的？
|
2016-04-29 16:54:48 +08:00 |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
2016-04-29 16:38:26 +08:00 |
|
huang
|
253189ea7a
|
帖子列表中添加分页
|
2016-04-29 16:33:10 +08:00 |
|
cxt
|
7445c64e46
|
课程和项目的帖子详情页面添加点赞
|
2016-04-29 16:23:36 +08:00 |
|
huang
|
0bd34c2099
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/layouts/base_sub_domain.html.erb
|
2016-04-29 16:15:10 +08:00 |
|
huang
|
f6c3e89454
|
二级目录帖子详细页面
|
2016-04-29 16:14:08 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
cxt
|
26c6c1d915
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 15:57:42 +08:00 |
|
cxt
|
1dc0f9dd95
|
主页的项目和课程排序
|
2016-04-29 15:55:29 +08:00 |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
|
yuanke
|
f8abd46ae9
|
列表修改
|
2016-04-29 15:52:44 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
Tim
|
388c059047
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-29 15:38:53 +08:00 |
|
Tim
|
5f1b335cfb
|
北斗二级菜单显隐
|
2016-04-29 15:38:38 +08:00 |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
2016-04-29 15:07:46 +08:00 |
|
huang
|
2b4f16e5f1
|
二级目录新界面的帖子列表页面
|
2016-04-29 14:46:40 +08:00 |
|
yuanke
|
196501bc39
|
项目列表问题
|
2016-04-29 14:08:25 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
huang
|
44f0615763
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-29 11:34:24 +08:00 |
|
huang
|
d8480ea3c6
|
二级目录内容页面
|
2016-04-29 11:33:56 +08:00 |
|
Tim
|
ebe6004833
|
组织二级目录添加列表
|
2016-04-29 10:53:04 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
2016-04-28 14:33:30 +08:00 |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
2016-04-28 14:31:40 +08:00 |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 12:38:06 +08:00 |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
2016-04-28 11:31:31 +08:00 |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
2016-04-28 11:12:44 +08:00 |
|
huang
|
4635c04798
|
关注添加次数
|
2016-04-28 10:57:45 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
huang
|
b8f7a6a300
|
500问题
|
2016-04-28 10:43:42 +08:00 |
|
yuanke
|
22fc31eb82
|
先把隐藏课程信息的功能去掉
|
2016-04-28 10:39:11 +08:00 |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
2016-04-28 10:32:32 +08:00 |
|
huang
|
7aaa13ca1a
|
左一只取一个
|
2016-04-28 10:26:41 +08:00 |
|
huang
|
ae8bb8e83b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-28 10:25:42 +08:00 |
|
huang
|
b596c0d66f
|
二级目录的创建等
|
2016-04-28 10:25:26 +08:00 |
|
huang
|
e48189ae97
|
项目获取数
|
2016-04-28 10:24:53 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |