 Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
9 years ago |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
9 years ago |
 cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
Tim
|
e8d4bc0772
|
弹框可拖拽
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
 huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
Tim
|
be5e74897a
|
项目弹框位置调整
|
9 years ago |
|
Tim
|
cb6750cd01
|
输入时，忘记密码和绑定按钮重合的bug
|
9 years ago |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
9 years ago |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
9 years ago |
|
huang
|
b86b2299a7
|
fork分支选择 js
|
9 years ago |
|
huang
|
b297446778
|
select选择框
|
9 years ago |
 yuanke
|
491b6fcb72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
9 years ago |
|
Tim
|
1335dc1b76
|
提示文字取消粗体
|
9 years ago |
|
Tim
|
28a29fa724
|
拖拽删除
|
9 years ago |
|
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
9 years ago |
|
yuanke
|
e4a414e550
|
微信菜单跳入加入项目和班级界面点取消要能返回公众号界面
|
9 years ago |
|
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
9 years ago |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
9 years ago |
|
yuanke
|
3c2ab32121
|
微信动态分享修改
|
9 years ago |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
|
yuanke
|
4bae4527a2
|
微信分享URL修改
|
9 years ago |
|
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
9 years ago |
|
yuanke
|
c0579de57d
|
微信分享内容修改
|
9 years ago |
|
yuanke
|
13d59be389
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
17c98eb9fe
|
微信分享修改
|
9 years ago |
|
Tim
|
7b6675ed6a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/join_project.html
|
9 years ago |
|
Tim
|
950b18c250
|
加入班级提示
|
9 years ago |
|
yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
9 years ago |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
9 years ago |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
9 years ago |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
|
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
9 years ago |
|
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
9 years ago |
 daiao
|
5f969c6593
|
单位审核相关Bug修复
|
9 years ago |
|
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
9 years ago |
guange
|
6f2b84570f
|
去除调试模式
|
9 years ago |
|
guange
|
56d6f4b9bc
|
定制分享内容
|
9 years ago |
|
guange
|
2a67ec5407
|
配置登录页菜单
|
9 years ago |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
9 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
|
Tim
|
be36755d95
|
代码合并页面
|
9 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
9 years ago |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
9 years ago |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
9 years ago |
|
yuanke
|
f3ae53dc97
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
Tim
|
b100651185
|
控制显示较多文字后显示省略号
|
9 years ago |
|
Tim
|
9a3acdd1db
|
删除注释
|
9 years ago |
|
Tim
|
6342137972
|
微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号
|
9 years ago |
|
Tim
|
24a6aabb6b
|
新建项目说明列表圆点大小与间距调整
|
9 years ago |
|
Tim
|
9e6575211f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
9 years ago |
|
yuanke
|
78e44617e3
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
daiao
|
4d3f4c358a
|
微信功能
|
9 years ago |
|
Tim
|
4abce11004
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
3d7b7b513b
|
隐藏文字超出省略号显示
|
9 years ago |
|
Tim
|
43498e79e8
|
项目说明居中对齐
|
9 years ago |
|
yuanke
|
18862fdee9
|
编辑课程文字修改
|
9 years ago |
|
yuanke
|
e478b050d1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
ce8f915d7e
|
分享修改成原来的
|
9 years ago |
|
Tim
|
a11dfcc9fb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
9 years ago |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
9 years ago |
|
yuanke
|
8bf69a2e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
9 years ago |
|
Tim
|
6b89460295
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
37e29404ba
|
微信班级管理图标可点击区域放大
|
9 years ago |
|
yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
Tim
|
4bbd72ecd2
|
发送班级页面发送按钮定位
|
9 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
Tim
|
318ef2bb30
|
微信定位高度
|
9 years ago |
|
Tim
|
40bb59ea9d
|
微信定位
|
9 years ago |
|
Tim
|
6078db7e39
|
sy_public.css样式重用处理
|
9 years ago |
|
Tim
|
9d7fa86cb6
|
syllabus.css样式重用处理
|
9 years ago |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
9 years ago |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
9 years ago |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
9 years ago |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
9 years ago |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
yuanke
|
e6e8d73a66
|
修改动态详情
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
yuanke
|
04e9551450
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
6a871e2116
|
.
|
9 years ago |
|
yuanke
|
4f803ce0de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
db7c267a47
|
微信单个项目动态
|
9 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
9 years ago |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
9 years ago |
|
yuanke
|
b9b9a867f4
|
项目
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
txz
|
216d590140
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c4f4908c62
|
资源tab定位
|
9 years ago |
|
huang
|
4d79f93079
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
yuanke
|
cedd7ae520
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
37a6adf428
|
二级回复代码统一写到comment_reply里面
|
9 years ago |
|
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
9 years ago |
|
txz
|
7d2ba823e9
|
缓存动态页tab，详情返回到对应tab页
|
9 years ago |
|
txz
|
cef08a717c
|
课程名称过长时，邀请码无法点击bug
|
9 years ago |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
9 years ago |
|
yuanke
|
178222858c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
16fef58885
|
发送班级界面不显示没班级的课程
|
9 years ago |
|
txz
|
b638f9aea6
|
tab页issue标题改为问题
|
9 years ago |
|
txz
|
19781ded4e
|
输入框padding调整
|
9 years ago |
|
txz
|
8fd915bf1a
|
issue标题改为问题
|
9 years ago |
|
yuanke
|
0622978920
|
微信新用户注册后返回公众号
|
9 years ago |
|
yuanke
|
9ababc5aa4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
5a8f1b3d83
|
绑定成功后返回公众号
|
9 years ago |
|
txz
|
00c3e880e6
|
微信详情页面返回定位js
|
9 years ago |
|
txz
|
4a58777bb9
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
0a0f8aefac
|
微信加入班级弹框css兼容；app页面meta标签修改
|
9 years ago |
|
yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
9 years ago |
|
yuanke
|
92ffbcfce6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
9 years ago |
|
txz
|
24ee25e095
|
课程列表点击管理课程图标，列表展开bug修复
|
9 years ago |
|
Tim
|
fe105c84ad
|
弹框定位改为fixed
|
9 years ago |
|
Tim
|
541440135f
|
css中引用图片路径修改
|
9 years ago |
|
Tim
|
dcb541e889
|
资源库资源列表取消虚线
|
9 years ago |
|
Tim
|
2850fe1b2b
|
预览图片边框阴影效果
|
9 years ago |
|
Tim
|
85c9fb5dce
|
二级回复图片超出显示
|
9 years ago |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
9 years ago |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
9 years ago |
|
yuanke
|
ff42de619b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c56f7732a1
|
二级回复新样式
|
9 years ago |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
9 years ago |
|
yuanke
|
bf600e8f76
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
9 years ago |
|
txz
|
53feb0bbd4
|
课程列表课程名称宽度限制
|
9 years ago |
|
txz
|
707df88c7f
|
tab容器宽度百分百
|
9 years ago |
|
txz
|
5b3c6cc012
|
输入框高度控制
|
9 years ago |
|
txz
|
2af1a5ffb9
|
新增班级和管理班级输入框高度控制
|
9 years ago |
|
txz
|
27965bee01
|
加入班级弹框样式统一
|
9 years ago |
|
yuanke
|
80843d5084
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
9 years ago |
|
txz
|
bc0d8cd299
|
管理班级重命名字体变灰
|
9 years ago |
|
Tim
|
73401d6b41
|
下拉图标等显示
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
9 years ago |
|
Tim
|
76555680e0
|
项目css统一
|
9 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
9 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
9 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
guange
|
c14979d878
|
assets
|
9 years ago |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
9 years ago |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
9 years ago |
|
yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
9 years ago |
|
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
c02245adfb
|
邀请码分享
|
9 years ago |
|
txz
|
b7477a73e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
6491e16c64
|
微信课程列表底边重合问题
|
9 years ago |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
yuanke
|
6385cc892f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
9 years ago |
|
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
9 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
9 years ago |
|
txz
|
0d08d6b192
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
6063932840
|
课程管理中，对课程,班级名称编辑时，字体变灰
|
9 years ago |
|
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
9 years ago |
|
guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
9 years ago |
|
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
dd892993dd
|
assets
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
guange
|
0e415fffff
|
merge
|
9 years ago |
|
yuanke
|
ae0a4f8ce4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
9 years ago |
|
txz
|
5a463721b8
|
资源来源限制宽度
|
9 years ago |
|
txz
|
08c6c16cfd
|
课程，项目详情页面属性字体减小
|
9 years ago |
|
txz
|
54887112e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
df8b995d41
|
作业，项目属性字体减小
|
9 years ago |
|
yuanke
|
dc2ba96353
|
用户注册发送绑定成功消息通知，加入班级消息通知点击跳入班级
|
9 years ago |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
9 years ago |
|
yuanke
|
16e029d340
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
4c39dcc677
|
微信：修改班级下有挂起作业所有作业都不显示的BUG，将班级下作业、测验发送按钮屏蔽
|
9 years ago |
|
txz
|
433f12f184
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
a43da43072
|
checked.png替换
|
9 years ago |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
Tim
|
c41a116378
|
博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改
|
9 years ago |
|
yuanke
|
9c560e56b6
|
微信修改 不能直接给数据库对象增加新属性
|
9 years ago |
|
Tim
|
1fdd1a2a21
|
作业列表css与develop分支同步；popup.css优化
|
9 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
Tim
|
fdf147326c
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
Tim
|
2b5e31cab9
|
样式与develop分支同步
|
9 years ago |
|
yuanke
|
af2b306953
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
3c426c8d15
|
微信中英文逗号修改
|
9 years ago |
|
txz
|
24821ba01d
|
登录与注册页面，输入文字显示不全bug
|
9 years ago |
|
Tim
|
538303f4d1
|
导航头像处理
|
9 years ago |
|
txz
|
e61aa9e0dc
|
回复框高度自动增减js同步
|
9 years ago |
|
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 |
