 huang
|
3ffe131a73
|
删除的提示
|
9 years ago |
|
huang
|
f308b24f5a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
9 years ago |
 Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
9 years ago |
 cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
9 years ago |
|
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
9 years ago |
|
huang
|
e901becfe6
|
发送权限问题
|
9 years ago |
 yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
bc8171501d
|
解决组织文章设为首页报500
|
9 years ago |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
9 years ago |
|
yuanke
|
0e827abd35
|
将代码测试编译器信息的冒号改为中文的
|
9 years ago |
|
huang
|
82f4c685da
|
消息拒绝问题
|
9 years ago |
|
huang
|
18054dd96d
|
私有资源不能下载
|
9 years ago |
|
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
9 years ago |
|
cxt
|
6479ace5e1
|
作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制
|
9 years ago |
|
cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
9 years ago |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
huang
|
dddd7e0ea2
|
下载
|
9 years ago |
|
Tim
|
c3f63709ed
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
9 years ago |
|
cxt
|
2895dd5342
|
作业二级回复的消息通知增加显示作业名称的tip
|
9 years ago |
|
huang
|
004c48b456
|
发送至课程项目局部刷新
|
9 years ago |
|
huang
|
f18c3ed667
|
私有资源中不添加”上传资源“的按钮
|
9 years ago |
|
huang
|
0d8d2939b3
|
资源不符合条件的不能选择框
|
9 years ago |
|
huang
|
80f829c018
|
解决搜索不能用的问题
|
9 years ago |
|
huang
|
1402f2076a
|
资源申请添加链接
|
9 years ago |
|
yuanke
|
0dd7aae08c
|
先注释自动识别URL
|
9 years ago |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
7da1418069
|
自动识别URL
|
9 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
984f706722
|
可发送权限控制
|
9 years ago |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
0b2f6c9a53
|
私有资源的搜索和排序
|
9 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
9 years ago |
|
huang
|
4c68da9bee
|
修正链接资源名
|
9 years ago |
|
huang
|
bddc807057
|
修正资源库弹框位置
|
9 years ago |
|
huang
|
99cbf0b54e
|
资源引用消息通知
|
9 years ago |
|
huang
|
f3f75a57bd
|
申请资源消息资源发布这收到消息
|
9 years ago |
|
yuanke
|
c208b79e2d
|
代码测试上面的语言右边 加上编译器信息
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
yuanke
|
0e016eed2a
|
KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布
|
9 years ago |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
9 years ago |
|
huang
|
615d0ddbd2
|
公共资源、私有资源请求分享界面及样式
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ddafa79835
|
无法展开隐藏楼层
|
9 years ago |
|
cxt
|
55a98d8d6e
|
作业二级回复的消息通知
|
9 years ago |
|
huang
|
07678e367e
|
资源新样式删除功能
|
9 years ago |
|
huang
|
4c71e525a7
|
资源新样式增加后，重命名功能
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
Tim
|
70ff3e2c19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
0b2fe1d88a
|
分组作业样式
|
9 years ago |
|
huang
|
61ba7b0c30
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
9 years ago |
|
huang
|
e9c35ae20f
|
组织未登录情况默认图片展示
|
9 years ago |
|
huang
|
985b1e4c95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
15ea9a9659
|
组织门户自动播放禁用
|
9 years ago |
|
Tim
|
1402ae190d
|
组织头像
|
9 years ago |
|
huang
|
20e8627b02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
326c3a84a0
|
还原域名问题
|
9 years ago |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
9 years ago |
|
Tim
|
aee56c7eca
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
545e4ac380
|
禁用组织门户合作伙伴自动滚动效果
|
9 years ago |
|
huang
|
b0f9d0280f
|
0
|
9 years ago |
|
huang
|
13cc5ceaa6
|
model中添加获取二级域名的方法
|
9 years ago |
|
Tim
|
e9a3bc5094
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
cxt
|
9caf9cbf2f
|
消息列表的消息，在点击时，要弹出新的浏览器页面
|
9 years ago |
|
Tim
|
fbbda96c60
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
fa788ced1b
|
资源库添加私有资源
|
9 years ago |
|
huang
|
6cca44df98
|
组织项目、课程动态问题
|
9 years ago |
|
huang
|
2484d642a1
|
组织500问题
|
9 years ago |
|
cxt
|
c25b63a254
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
37b93a4595
|
文章回复不能用的问题
|
9 years ago |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5bc19d7ef0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
9 years ago |
|
huang
|
a31ffbf8fb
|
教师栏目不能添加二级域名
|
9 years ago |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
9 years ago |
|
huang
|
519ed365cc
|
导入资源按钮点击没反应问题
|
9 years ago |
|
cxt
|
66c410884f
|
作业是否需要请求分享，只判断了用户是否属于课程，未判断作业创建者的ID，如果用户不在某个课程了，则变成需要自己向自己申请作业，且【我的题库】也不显示自己之前创建的作业了。
|
9 years ago |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
9 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
9 years ago |
|
cxt
|
bc39b68bb2
|
新建测验题目、问卷题目防止多次提交表单
|
9 years ago |
|
huang
|
6ccb79a210
|
教师列表颜色
|
9 years ago |
|
huang
|
6d484e15fd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
39d014355b
|
科大名师，和名师列表添加标题
|
9 years ago |
|
Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
Tim
|
afbe5317cb
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
a88ab59489
|
名师榜添加右侧banner
|
9 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
f1c0347ee2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
5ae580aab0
|
添加用户连接
|
9 years ago |
|
cxt
|
22523d25b8
|
贴吧发帖防止多次提交表单
|
9 years ago |
|
huang
|
660cf7ef73
|
名师列表局部搜索
|
9 years ago |
|
cxt
|
01287ff93c
|
学生打开新建的作业列表报500
|
9 years ago |
|
cxt
|
dc6c5fe18b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
9 years ago |
|
Tim
|
1833f15e19
|
课程资源库导入资源样式修改
|
9 years ago |
|
huang
|
91f3fddb16
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
0feb1280fd
|
名师更多列表
及相关入口路由
|
9 years ago |
|
Tim
|
4ea7d5ed57
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
|
huang
|
e90da9d812
|
teachers页面
|
9 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
9 years ago |
|
huang
|
457bac0b9d
|
0
|
9 years ago |
|
huang
|
7bd047f7e4
|
组织模式二中名师榜样式
|
9 years ago |
|
huang
|
f7a888ac3d
|
名师默认创建
|
9 years ago |
|
cxt
|
979598f334
|
课程问答区帖子的发送防止连续提交
|
9 years ago |
|
cxt
|
345e1c0a48
|
评分的回复连续点击多次防止提交多次表单
|
9 years ago |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
9 years ago |
|
huang
|
61803aa696
|
删除名师榜的时候局部刷新
|
9 years ago |
|
huang
|
e8d76f449f
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
1673ae451b
|
名师榜新增一个后就不能再新增
|
9 years ago |
 Linda
|
aec7366594
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Linda
|
a2418396dd
|
邦本库zip下载样式界面
|
9 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
9 years ago |
|
huang
|
37ee03374e
|
完成设置名师功能
|
9 years ago |
|
cxt
|
f74e5eb6ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
9 years ago |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
9 years ago |
|
huang
|
2be8e64748
|
内容和查看更多重复问题
|
9 years ago |
|
cxt
|
d4c1f27533
|
私有作业请求分享时，强制要求写请求分享的说明文字
|
9 years ago |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
9 years ago |
|
cxt
|
ac5a9c87ac
|
消息通知中的“同意|拒绝”调整宽度
|
9 years ago |
|
cxt
|
ca5f03f2ea
|
作业回复的消息通知，评阅作品的消息通知修改
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
cxt
|
f4b8f2c794
|
学生追加附件发送消息
|
9 years ago |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
9 years ago |
|
huang
|
3dde8bd25a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
52c8593b09
|
组织教师列表sql优化
|
9 years ago |
|
Tim
|
b649882a23
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
7957beb64a
|
发送至按钮样式控制
|
9 years ago |
|
cxt
|
fdefbf3795
|
作品打分连续点击不会多次提交
|
9 years ago |
|
cxt
|
d232a5241e
|
新建课程报404
|
9 years ago |
|
cxt
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
9 years ago |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
9 years ago |
|
huang
|
c28c947abc
|
项目动态中添加作者
|
9 years ago |
|
huang
|
a4a211448c
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
f4b10d45d2
|
版本库鼠标经过的时候显示具体时间
|
9 years ago |
|
Tim
|
d7add63f56
|
二级栏目列表页回复不可点击
|
9 years ago |
|
txz
|
67380d58d4
|
博客锁定置顶位置
|
9 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
9 years ago |
|
txz
|
9b55d8b527
|
微信版标题显示不完整
|
9 years ago |
|
huang
|
cabac5914c
|
学生统计数
|
9 years ago |
|
yuanke
|
629591ad00
|
课程、项目列表更新时间取动态表中的
|
9 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
9 years ago |
|
cxt
|
ba07e564db
|
老师评分的弹框
|
9 years ago |
|
huang
|
e99aa2f199
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
9 years ago |
|
cxt
|
d303a06377
|
首页列表的排序
|
9 years ago |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
9 years ago |
|
Tim
|
e8424d9b97
|
项目时间字体大小控制
|
9 years ago |
|
Tim
|
c8e0ffbdae
|
左二和右二文字隐藏时的更多显示
|
9 years ago |
|
huang
|
ccc4ddc325
|
组织编辑问题
|
9 years ago |
|
huang
|
5880a12290
|
sql查询
|
9 years ago |
|
Tim
|
2461a5c918
|
组织门户二级目录位置重新设置
|
9 years ago |
|
Tim
|
c2e7a77150
|
组织门户二级菜单延迟隐藏
|
9 years ago |
|
Tim
|
b32693ca2a
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
9 years ago |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
9 years ago |
|
huang
|
fc36e4c01e
|
教师列表
|
9 years ago |
|
cxt
|
1eb41478b2
|
课程动态和首页动态中的作业动态实现二级回复
|
9 years ago |
|
huang
|
a98678e001
|
列表中类型显示方法封装
|
9 years ago |
|
huang
|
878bcc8cf1
|
栏目创建类型添加老师、学生类型
|
9 years ago |
|
huang
|
7a0d86228a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
635d49cc25
|
course->课程动态
project->项目动态
|
9 years ago |
|
cxt
|
e03bc42c53
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/words_controller.rb
|
9 years ago |
|
huang
|
96ce1d8d40
|
| 及更多问题
|
9 years ago |
|
huang
|
6401afb850
|
二级目录排序同步
|
9 years ago |
|
huang
|
9a80ff0597
|
右一添加“更多”链接
|
9 years ago |
|
cxt
|
90809ea350
|
首页报500
|
9 years ago |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
ece84e912d
|
鼠标经过显示标题
|
9 years ago |
|
huang
|
b7d87966dd
|
时间显示样式
|
9 years ago |
|
huang
|
8323422f09
|
回复留言为空则不能提交
|
9 years ago |
|
cxt
|
54cdd57f89
|
二级回复的内容与上边框的距离调整
|
9 years ago |
|
huang
|
d672c80edb
|
换行问题
|
9 years ago |
|
huang
|
cd0603f01b
|
模式二里面的链接问题
|
9 years ago |
|
huang
|
967a76af67
|
图片变大的问题
|
9 years ago |
|
huang
|
3469d928d8
|
图片变的很大问题
|
9 years ago |
|
huang
|
23a23fd085
|
组织logo上传图片
|
9 years ago |
