 yuanke
|
a5acc2641e
|
微信点赞保证各个切换之间点赞状态保持一致
|
9 years ago |
 txz
|
f83d791de1
|
进入课程后，课件，作业，测验及学生管理tab样式更改
|
9 years ago |
|
txz
|
2cc87f1dd8
|
课程页面各tab显示bug
|
9 years ago |
|
yuanke
|
2844ac2e65
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
d75e2b740f
|
微信点击我的课程里面的两个按钮时没绑定会提示绑定
|
9 years ago |
|
txz
|
78a6785b6b
|
微信回复框自动增高
|
9 years ago |
|
txz
|
77f5ad09d2
|
各详情页面回复内容全部显示
|
9 years ago |
|
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
9 years ago |
|
txz
|
4434eb3620
|
回复框固定在最下显示
|
9 years ago |
|
txz
|
9d91e9397b
|
微信邀请码提示文字修改
|
9 years ago |
|
txz
|
f33feb7d84
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
243f0bbe7d
|
微信详情内容与回复中链接添加蓝色
|
9 years ago |
|
yuanke
|
4111ae632c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
d4681eea00
|
我的资源里面显示来源 和大小 并可以下载课件
|
9 years ago |
|
txz
|
e3fe95213f
|
增加二级回复与文字间距离
|
9 years ago |
|
yuanke
|
14b7b04e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
dc6127eb78
|
微信我的资源样式更改
|
9 years ago |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
9 years ago |
 cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
txz
|
cf304c2b68
|
dot.png图片更新
|
9 years ago |
|
yuanke
|
627135ec12
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
9 years ago |
|
txz
|
bd29859a28
|
创建课程和参与课程区分样式
|
9 years ago |
|
txz
|
0093a0a509
|
微信邀请提示文字更改
|
9 years ago |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
Tim
|
1aee5b6955
|
将大纲中共用样式提出；个性签名resize：none
|
9 years ago |
 huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
93e79d9419
|
add hidden to css
|
9 years ago |
|
txz
|
114512d3d9
|
资源宽度限制
|
9 years ago |
|
txz
|
2e75fa4b23
|
课程动态中新建课程改为新建班级
|
9 years ago |
|
txz
|
6ea1a605c9
|
flex布局兼容css更新
|
9 years ago |
|
cxt
|
8e8d6a8439
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
guange
|
135b6ca64b
|
assets
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
2b17828844
|
rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
2604f3f0c7
|
资源搜索中只匹配name
|
9 years ago |
|
yuanke
|
f8eb150530
|
新增班级不完成点返回班级会出现再课程列表的BUG
|
9 years ago |
|
guange
|
1413fe82dc
|
merge
|
9 years ago |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
9 years ago |
|
yuanke
|
8d8de084ac
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等
|
9 years ago |
|
txz
|
ea5bd94e99
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
9ae7461501
|
资源列表学生进入时也显示为课件；课程tab页样式替换
|
9 years ago |
|
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
3c23560d77
|
我的资源搜索无效
|
9 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
9 years ago |
|
Tim
|
03bb862e18
|
代码查重页面消息弹框显示样式丢失
|
9 years ago |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
9 years ago |
|
yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
9 years ago |
|
Tim
|
fec1015604
|
在线测验结果列表超出bug修改
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
huang
|
e588321ada
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
61e2e427fd
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
9 years ago |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
Tim
|
d7fb0d4bca
|
添加关注，取消关注图标更新
|
9 years ago |
|
Tim
|
fbedaea768
|
图标显示css修改
|
9 years ago |
|
Tim
|
65cbf14d72
|
提交与取消按钮间添加间距；图标不显示等
|
9 years ago |
|
cxt
|
3b418bc44c
|
如果未登陆，在资源列表最上面增加一个提示句（必须全局统一：您尚未登录，登录后可浏览更多信息），“登录”可做成链接。
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
9 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
|
guange
|
a2ba65956c
|
.
|
9 years ago |
|
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
9 years ago |
|
guange
|
7859bf9c32
|
.
|
9 years ago |
|
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
10789d2505
|
added alert2
|
9 years ago |
|
huang
|
92b6171c36
|
sonar error puts
|
9 years ago |
|
Tim
|
421dc636fe
|
作业列表样式更新
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直
|
9 years ago |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
9 years ago |
|
Tim
|
0b764d0dfc
|
RSide样式处理
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
9 years ago |
|
Tim
|
d2d2222ea2
|
组织成员列表样式调整
|
9 years ago |
|
Tim
|
4136aa9291
|
二级回复，上传附件后删除图标，文件图标显示，
|
9 years ago |
|
Tim
|
d9fc479607
|
消息弹框显示css调整
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
253933c85a
|
消息通知图标显示
|
9 years ago |
|
Tim
|
b91d6a3273
|
班级动态筛选框样式调整
|
9 years ago |
|
Tim
|
c3bc901925
|
对#Rside样式处理
|
9 years ago |
|
Tim
|
fae2dc324c
|
登录注册页面图标显示
|
9 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
9 years ago |
|
Tim
|
4cbae10934
|
同步devlope分支css
|
9 years ago |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
9 years ago |
|
txz
|
7a9665bbee
|
微信详情页面样式调整
|
9 years ago |
|
cxt
|
4a5bdc5e48
|
课程列表中的班级显示适当缩进
|
9 years ago |
|
cxt
|
f83bd3cf63
|
课程英文名称输入框去掉拉动图标
|
9 years ago |
|
txz
|
8a59623a73
|
项目问题，项目讨论区，博客，留言详情页面样式更新
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
txz
|
64a1d197ee
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
3066a564bd
|
课程作业详情页面样式更新
|
9 years ago |
|
guange
|
373e3d3422
|
merge
|
9 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
9 years ago |
|
yuanke
|
08f263128c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
9 years ago |
|
txz
|
45b824938e
|
课程讨论区与课程通知详情页面样式更新
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
txz
|
bd1aae07fd
|
微信动态页面样式更新
|
9 years ago |
|
cxt
|
599cedaa18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
guange
|
3c295ba5a1
|
merge
|
9 years ago |
|
guange
|
201abd6358
|
assets
|
9 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
9 years ago |
|
huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
9 years ago |
|
Tim
|
28c20c966e
|
查看标签页面显示bug
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5a1090c0e1
|
bug修复
|
9 years ago |
|
cxt
|
6867a88a94
|
课程大纲样式调整
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
Tim
|
9cb0160930
|
课程资源，学生，教师列表css调整
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
5cc40408ee
|
修改KE单倍行距显示的时候不一致的BUG
|
9 years ago |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
Tim
|
ba1db91a1e
|
css优化调整
|
9 years ago |
|
cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
guange
|
c248249983
|
注册没有loading图问题
|
9 years ago |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
9 years ago |
|
Tim
|
590b879f02
|
追加附件弹框不固定bug修复
|
9 years ago |
|
guange
|
2886bba2bc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
2596231ce7
|
微信新动态样式更新
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
yuanke
|
376ec39035
|
Merge branch 'develop' into yuanke_org
|
9 years ago |
Your Name
|
a08edcca8a
|
quanxian
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
txz
|
b2b6536a0f
|
微信css样式更新
|
9 years ago |
|
guange
|
e9f280b4aa
|
.
|
9 years ago |
|
guange
|
047903ddff
|
重构课程地址
|
9 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
9 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
9 years ago |
|
yuanke
|
11d38fc3e3
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
a83400f233
|
粘贴图片 留言和回复框 保持一直截图都可以粘贴进去
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
