 cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
9 years ago |
 yuanke
|
e4312674c4
|
KE表格修改
|
9 years ago |
|
yuanke
|
4cb4213a52
|
修改blockquote样式
|
9 years ago |
|
yuanke
|
ec39c16c66
|
Merge branch 'develop' into yuanke
|
9 years ago |
 txz
|
24a17d719e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
9b4a3a704d
|
锁定帖子不能回复
|
9 years ago |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
9 years ago |
guange
|
b965698fdf
|
merge
|
9 years ago |
|
guange
|
8b05b33e38
|
不刷新返回
|
9 years ago |
 huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
guange
|
1251e31061
|
不刷新返回
|
9 years ago |
|
guange
|
37975552c9
|
base
|
9 years ago |
|
guange
|
5b34f498c9
|
base
|
9 years ago |
|
guange
|
fbfb382d78
|
base
|
9 years ago |
|
guange
|
f993fa87ff
|
base
|
9 years ago |
|
guange
|
8fb88dfdea
|
base
|
9 years ago |
|
guange
|
5fe41d80e9
|
base
|
9 years ago |
|
guange
|
b01a671fb4
|
base
|
9 years ago |
|
huang
|
09ff5954bd
|
字体过长演示问题（模式二子页面）
|
9 years ago |
|
guange
|
90ac57ed6a
|
base
|
9 years ago |
|
guange
|
eee8a8adb6
|
fix
|
9 years ago |
|
guange
|
33780759a9
|
修改为html5mode
|
9 years ago |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
guange
|
f5da2ba5f6
|
将current page提前
|
9 years ago |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
9 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
9 years ago |
|
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
9 years ago |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
9 years ago |
|
cxt
|
91f7e950ee
|
正式版微信
|
9 years ago |
|
yuanke
|
1173bb9039
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
4c92e73cf1
|
根据http和https显示视频
|
9 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
9 years ago |
|
huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
2d2e9c540a
|
默认图片及顺序
|
9 years ago |
|
Tim
|
3c6c617d09
|
门户样式冲突问题
|
9 years ago |
|
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1396cae14c
|
消息弹框
|
9 years ago |
|
huang
|
a71c4a50bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
709ceca1a8
|
托代码改动
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
9 years ago |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
9 years ago |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
9 years ago |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
9 years ago |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
Tim
|
308f247c71
|
可拖拽调整
|
9 years ago |
|
cxt
|
cba5b246bc
|
微信动态的返回不刷新
|
9 years ago |
|
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
9 years ago |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
9 years ago |
|
guange
|
51d3fc3aad
|
更多修复
|
9 years ago |
|
guange
|
ceffa6c2c8
|
更多修复
|
9 years ago |
|
guange
|
03357388bd
|
更多修复
|
9 years ago |
|
guange
|
553a02c89d
|
更多修复
|
9 years ago |
|
guange
|
c26d544772
|
更多修复
|
9 years ago |
|
guange
|
c9eddad45d
|
更多修复
|
9 years ago |
|
guange
|
32ffd2a5b5
|
返回优化完成
|
9 years ago |
|
guange
|
48b36e5d16
|
优化返回刷新
|
9 years ago |
|
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
guange
|
13d11e2239
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
4815dc3c7b
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
6e44e8355c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
1bdf8800bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
9 years ago |
|
txz
|
7e93518d41
|
app.js配置
|
9 years ago |
|
txz
|
e121d7d927
|
二级回复显示边框区分
|
9 years ago |
|
txz
|
80452ceef9
|
app.js文件更改
|
9 years ago |
|
txz
|
91be3b9f85
|
回复提交时按钮变灰
|
9 years ago |
|
txz
|
f166a951f3
|
详情页面文字格式问题
|
9 years ago |
|
cxt
|
79c106a1c6
|
微信动态的缺失
|
9 years ago |
|
txz
|
19de82359a
|
微信进入详情页面显示加载中
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
9 years ago |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
9 years ago |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
huang
|
389172e5b2
|
CSS样式
|
9 years ago |
|
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
9 years ago |
|
yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
9 years ago |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
3ba4d09336
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
9 years ago |
|
Tim
|
5f27519c67
|
table可拖拽
|
9 years ago |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
9 years ago |
|
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
9 years ago |
|
txz
|
29faa015ab
|
微信图标替换，增加空值回复赞文字
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
25aaa4b5bc
|
铃铛、搜索颜色
|
9 years ago |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
cxt
|
99c1821b4e
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
txz
|
9134e55606
|
动态纯文本模式，图标处理
|
9 years ago |
|
txz
|
e7039df875
|
微信点击跳转区域更改，内容字体大小颜色更改
|
9 years ago |
|
yuanke
|
54e62c778a
|
保证python编程的中文注释可用
|
9 years ago |
|
cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
9 years ago |
|
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
9 years ago |
|
yuanke
|
9603115a86
|
KE编辑时链接的颜色改为和显示的时候一样并将下划线去掉
|
9 years ago |
|
txz
|
7bb94d9df4
|
详情页面将内容和框架同时显示
|
9 years ago |
|
txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c73ce61afe
|
微信动态可点击，icon图片替换
|
9 years ago |
|
guange
|
01428fad14
|
merge
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
yuanke
|
192258a82d
|
1.取消KE编辑时候段落的上下边距
2.先编号后段落 可以切换段落样式 正文还不能切换
|
9 years ago |
|
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
9 years ago |
|
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
9 years ago |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
9 years ago |
|
txz
|
c4c0dd3c60
|
回复内容换行符未显示
|
9 years ago |
|
yuanke
|
fcaa9666e2
|
KE内容自动识别网址加上超链接时把颜色也加上
|
9 years ago |
|
yuanke
|
46860a838b
|
1.设置表格边框后所有的表格线宽度都一样
2.KE改变字体后再点击字体会标明当前的字体
|
9 years ago |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
9 years ago |
|
yuanke
|
9e8411aac9
|
修改ke：issue描述只有一行，点击编辑后，描述框被拉高了，有很多空白
|
9 years ago |
|
Tim
|
1c0a68e57b
|
组织配置成员tab，搜索结果太多导致换页断行问题
|
9 years ago |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
9 years ago |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
9 years ago |
|
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
9 years ago |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
9 years ago |
|
txz
|
103af96ac2
|
替换加载中gif图
|
9 years ago |
|
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
dd4786d639
|
作品列表查看详情定位
|
9 years ago |
|
txz
|
d329b60a8a
|
微信加载中去白底，内容去除固定行高
|
9 years ago |
|
Tim
|
5f4a9304fe
|
提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整
|
9 years ago |
|
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
9 years ago |
|
yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
9 years ago |
|
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
ef1a5d32f2
|
顶端背景色
|
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 |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
9 years ago |
|
yuanke
|
ed58e78065
|
KE表格颜色问题
|
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 |
|
cxt
|
3ebef0eae2
|
消息通知中申请引用作业的用户点击申请的消息打开没有权限访问的页面
|
9 years ago |
|
txz
|
66042cb3c9
|
debug false
|
9 years ago |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
9 years ago |
|
txz
|
278ee66368
|
系统冲突
|
9 years ago |
|
txz
|
1b3bc38f8e
|
拖代码改动
|
9 years ago |
|
yuanke
|
52724bd9ed
|
KE ol ul标签增加margin-bottom:0
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
yuanke
|
0e016eed2a
|
KE上传非图片格式时弹框用新的,博客帖子发帖时间改为发布
|
9 years ago |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0ac7163b05
|
KE修改居中换行居中消失的问题
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
yuanke
|
93fb4441d8
|
代码测试改用新的提示框
|
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 |
|
Tim
|
76d1251546
|
将组织门户登录栏挪到与logo同行
|
9 years ago |
|
guange
|
80be46dc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
4b4a48b0c4
|
sso rsa解码这块处理,因为php只能处理117个字节,所以要拆分开
|
9 years ago |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
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 |
|
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
6056505f96
|
复制粘贴时将图片所带链接删掉
|
9 years ago |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
9 years ago |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
9 years ago |
|
huang
|
0d2a7d8bfd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
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 |
|
Tim
|
d384d1e2b4
|
名师榜样式调整
|
9 years ago |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
9 years ago |
|
txz
|
8d338cff9e
|
微信锁定帖子关闭回复
|
9 years ago |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
1cd74121ae
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
a67ee38ac9
|
将复制粘贴的图片 链接及class都去掉
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
yuanke
|
fc0f92738d
|
复制粘贴时将图片所带链接去掉
|
9 years ago |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
9 years ago |
|
yuanke
|
80c6edd2d3
|
KE过滤html代码的时候表格的颜色等样式不能被过滤掉
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
