 txz
|
282e1b41e1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
txz
|
6957c24da5
|
微信最新动态页面调整
|
9 years ago |
 yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
txz
|
d0331da0c2
|
微信最新动态样式调整
|
9 years ago |
 huang
|
4e4cb309a9
|
版本库目录最新动态
|
9 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
9 years ago |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
9 years ago |
 cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
8611fbbdec
|
新建课程界面中关于学时的输入提示不合理，提示为只能输入数字，但是输入负数或小数时不能执行提交操作，应该修改为只能输入正整数。
|
9 years ago |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
4a8d572cb1
|
项目动态中版本库统计样式
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
9 years ago |
|
Tim
|
f479277a96
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
txz
|
13576ca477
|
app.js
|
9 years ago |
|
huang
|
adf6cca435
|
完成代码行数的提交和统计
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
f5122d7ef0
|
微信url切换到正式版
|
9 years ago |
|
Tim
|
deda05b048
|
作业下拉选择
|
9 years ago |
|
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
9 years ago |
|
cxt
|
a6f4b7f505
|
测试版
|
9 years ago |
|
huang
|
04849659de
|
版本库统计
|
9 years ago |
|
cxt
|
e420be8ee9
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
txz
|
38c182d76a
|
作业发布者真名为空时，显示昵称
|
9 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
9 years ago |
|
txz
|
3665597153
|
详情页面排版调整
|
9 years ago |
|
txz
|
a6fcb072c0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
f82ad97a68
|
详情页面回复框宽度问题
|
9 years ago |
guange
|
7c5d62b8a8
|
头像url不显示
|
9 years ago |
|
guange
|
18f5f08bb7
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
guange
|
73ad787e23
|
修改到正式版
|
9 years ago |
|
guange
|
cadb5f3f15
|
更换服务器至test.course.trustie.net
|
9 years ago |
|
huang
|
a2a3d6b6b9
|
Merge remote-tracking branch 'remotes/origin/weixin_guange' into develop
Conflicts:
app/models/blog_comment.rb
|
9 years ago |
|
cxt
|
c041f742c1
|
缺陷和留言的回复
|
9 years ago |
|
cxt
|
007fee95bd
|
作业和留言回复的模板消息
|
9 years ago |
|
cxt
|
3f365e75b5
|
讨论区的模板消息
|
9 years ago |
|
cxt
|
b6adaf61db
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
930d95f8b5
|
私有动态不显示的问题
|
9 years ago |
|
txz
|
02a5e7752d
|
微信环境切换
|
9 years ago |
|
cxt
|
281fcf315f
|
点击模板消息页面为空
|
9 years ago |
|
huang
|
cd9ad535f5
|
1、修改默认图片
2、作品弹框问题
|
9 years ago |
|
txz
|
0262e3b8ab
|
回复长单词显示问题
|
9 years ago |
|
cxt
|
89330f9e40
|
调试
|
9 years ago |
|
cxt
|
d6daa906b6
|
回复
|
9 years ago |
|
cxt
|
de8d630fc1
|
解决冲突
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
9 years ago |
|
txz
|
c88e924843
|
博客留言html内容转义
|
9 years ago |
|
cxt
|
1cb1835a1a
|
动态
|
9 years ago |
|
cxt
|
c5048d7c72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
e007ee58ef
|
博客动态
|
9 years ago |
|
guange
|
ef317089f1
|
错误信息打印到日志
|
9 years ago |
|
guange
|
a35511195a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
abf4a80942
|
错误信息打印到日志
|
9 years ago |
|
cxt
|
eee7b89388
|
项目动态
|
9 years ago |
|
txz
|
707127631e
|
微信公众号样式调整
|
9 years ago |
|
guange
|
4e50a9e289
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
txz
|
4ab96586de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
f3738519e9
|
长单词折行问题
|
9 years ago |
|
cxt
|
1503686ddb
|
无更多动态时不显示更多
|
9 years ago |
|
huang
|
3501d6f1d6
|
完成组织模块的开发
|
9 years ago |
|
cxt
|
bb71d1c322
|
调试模式
|
9 years ago |
|
txz
|
411a8be8b8
|
点击展开
|
9 years ago |
|
txz
|
139a7931ee
|
点赞功能修改
|
9 years ago |
|
cxt
|
60c8320f82
|
praise api的修改
|
9 years ago |
|
txz
|
938bf48d08
|
点赞功能修改
|
9 years ago |
|
cxt
|
2fe32fda61
|
点赞的js
|
9 years ago |
|
txz
|
eb996280a6
|
点赞功能
|
9 years ago |
|
cxt
|
f1783c06a2
|
详情页面传参openid
|
9 years ago |
|
txz
|
3008c0c44d
|
activities.html冲突解决
|
9 years ago |
|
txz
|
0b1b08bd3d
|
点赞
|
9 years ago |
|
guange
|
80f47476cb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
99f39696d0
|
点击展开功能完成
|
9 years ago |
|
txz
|
572d84b55d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
6d8ffabb39
|
代码优化
|
9 years ago |
|
guange
|
8ac8e1c9e5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
79dcd48d8c
|
重构
|
9 years ago |
|
cxt
|
a0e95976ac
|
详情页面的点赞
|
9 years ago |
|
cxt
|
edb18bd1b8
|
api提供has_praise
|
9 years ago |
|
txz
|
8e1473a484
|
点赞代码优化等
|
9 years ago |
|
txz
|
ec47fb1949
|
项目缺陷详情页面修改
|
9 years ago |
|
txz
|
a1ef398b9d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
422621759e
|
项目讨论区详情修改
|
9 years ago |
|
cxt
|
20bb8c1e09
|
留言详情页面
|
9 years ago |
|
cxt
|
7cc98db541
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
2ede6e2b9d
|
博客详情页面
|
9 years ago |
|
txz
|
6115e374bf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
a1a9dbd8a3
|
项目讨论区详情页面
|
9 years ago |
|
guange
|
42bd2dcfc5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
3ee79a6889
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
# Conflicts:
# public/javascripts/wechat/app.js
|
9 years ago |
|
guange
|
70c2c9cc9f
|
把activities列表存起来,防止返回时页面变空
|
9 years ago |
|
txz
|
468f3ae63e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c9687a8764
|
课程通知详情页面
|
9 years ago |
|
cxt
|
e46c963931
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
6c527a9a54
|
点赞的api
|
9 years ago |
|
txz
|
feb0014bf8
|
作业详情页面
|
9 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
9 years ago |
|
txz
|
18cda892d9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
be30ac889b
|
冲突
|
9 years ago |
|
txz
|
0d04f996c5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
035b47d2b7
|
issue页面的调整
|
9 years ago |
|
guange
|
606599047d
|
详情页出错
|
9 years ago |
|
guange
|
23ec67b2eb
|
详情页出错
|
9 years ago |
|
guange
|
afd779f292
|
使用cookies存储openid
|
9 years ago |
|
guange
|
80d5424ff3
|
详情页出错
|
9 years ago |
|
guange
|
619b07b5c2
|
服务器上调试openid成功
|
9 years ago |
|
txz
|
50c6b565e7
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
11651fc866
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
bb5a527f9e
|
配置新菜单
|
9 years ago |
|
txz
|
b2a892bd22
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
417484f3ad
|
加入调试标志
|
9 years ago |
|
txz
|
48e26fce62
|
冲突解决
|
9 years ago |
|
txz
|
8c7de04dbf
|
项目问答详情页面
|
9 years ago |
|
guange
|
36f3e3a46c
|
改为angularjs实现
|
9 years ago |
|
guange
|
58c1b27600
|
加入openid传参
|
9 years ago |
|
guange
|
e1f1c6fbc0
|
openid参数
|
9 years ago |
|
guange
|
1926f0ba53
|
修改openid路由
|
9 years ago |
|
guange
|
9c93b3f9a6
|
修改openid调用位置
|
9 years ago |
|
guange
|
7d4de36521
|
修改openid调用位置
|
9 years ago |
|
guange
|
5839959f0a
|
修改openid调用位置
|
9 years ago |
|
cxt
|
9da89ef5e2
|
课程通知的回复
|
9 years ago |
|
huang
|
86aecd21b9
|
上传图片
|
9 years ago |
|
cxt
|
d47f887fd1
|
issue回复的修改
|
9 years ago |
|
cxt
|
bc5e455f0f
|
解决冲突
|
9 years ago |
|
cxt
|
790b452a9b
|
issue回复
|
9 years ago |
|
txz
|
d45604c4a0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
3b70970651
|
问题跟踪详情页面修改
|
9 years ago |
|
cxt
|
cc2fe6108a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
5e697e5367
|
作业的回复
|
9 years ago |
|
txz
|
0d24de7198
|
详情页面回复
|
9 years ago |
|
cxt
|
7dccb0d963
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
88c39512b9
|
journal的修改
|
9 years ago |
|
txz
|
58e5fe85c3
|
issue 详情页面
|
9 years ago |
|
txz
|
4902361b3f
|
冲突解决
|
9 years ago |
|
txz
|
596bf641ac
|
最新动态各详情页面
|
9 years ago |
|
cxt
|
b3b0488bf5
|
动态点击更多
|
9 years ago |
 Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
9 years ago |
|
huang
|
8f4ff2bf91
|
列表样式问题
|
9 years ago |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
9 years ago |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
9 years ago |
|
huang
|
45343a44b8
|
修改链接
|
9 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
9 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
9 years ago |
|
Yiang Gan
|
f23c0e7602
|
最新动态修改
|
9 years ago |
|
Tim
|
77e11fe0fe
|
微信最新动态修改
|
9 years ago |
|
Yiang Gan
|
6dc374cf9a
|
最新动态
|
9 years ago |
|
huang
|
0244008b32
|
一些链接和样式
|
9 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
9 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
9 years ago |
|
huang
|
961a264e05
|
创建时间统一date
|
9 years ago |
|
huang
|
65e80b1978
|
用户图像样式
|
9 years ago |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
9 years ago |
 ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
9 years ago |
|
ouyangxuhua
|
9e599da365
|
组织动态，点击展开更多没有反应问题解决
|
9 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
9 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
9 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
9 years ago |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
9 years ago |
|
Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
9 years ago |
|
Tim
|
a9fd79ec63
|
微信动态筛选
|
9 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
9 years ago |
|
guange
|
d5124e128e
|
添加调试功能
|
9 years ago |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
9 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
9 years ago |
|
Tim
|
4f7d698076
|
wechat init
|
9 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
9 years ago |
|
yuanke
|
63ae921c40
|
return 放错位置了
|
9 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
9 years ago |
|
yuanke
|
3c1be19702
|
修改编程提示语句
|
9 years ago |
|
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
9 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
9 years ago |
|
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
9 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
9 years ago |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
9 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
9 years ago |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
9 years ago |
|
guange
|
aaa2a0dea7
|
手机头修改
|
9 years ago |
|
guange
|
7804a1e9ec
|
url更改
|
9 years ago |
|
guange
|
908b3dfdbd
|
利用reactjs前后端分离
|
9 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
9 years ago |
|
guange
|
6ae4cd0767
|
merge
|
9 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
guange
|
59923dfb03
|
merge
|
9 years ago |
|
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
9 years ago |
|
cxt
|
d2bff21de5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
9 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
9 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
9 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
9 years ago |
 alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
9 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
9 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
9 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
9 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
9 years ago |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
9 years ago |
|
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
9 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
9 years ago |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
9 years ago |
|
luoquan
|
1900a824e8
|
0
|
9 years ago |
|
luoquan
|
1e256add7f
|
媒体播放默认样式
|
9 years ago |
|
luoquan
|
033c7991e1
|
修改媒体播放
|
9 years ago |
|
luoquan
|
ec4b7e3744
|
视频默认图标
|
9 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
9 years ago |
|
luoquan
|
62f91865e0
|
kindeditor视频添加默认图片
|
9 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
9 years ago |
|
luoquan
|
e80caf87b2
|
还原行距问题
|
9 years ago |
|
luoquan
|
2d14b26c11
|
还原行距问题
|
9 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
9 years ago |
|
yuanke
|
28b481cf36
|
修改KE点击上传图片时选择非图片格式时的提示信息
|
9 years ago |
|
yuanke
|
6fa2fd8b47
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
9b5cd8f880
|
KE表格修改
|
9 years ago |
|
yuanke
|
5ea618b520
|
修改KE插入图片没显示完全的问题
|
9 years ago |
|
luoquan
|
a6da304b56
|
修改KE编辑换行后发布对不齐问题
|
9 years ago |
|
luoquan
|
1c6deadfd7
|
修改KE编辑的内容与发布的样式对其不一致问题
|
9 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
9 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
9 years ago |
|
yuanke
|
0805bfce6a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
5dcd3b6826
|
解决KE工具栏一行与两行显示不一致的情况
|
9 years ago |
