 yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
 Tim
|
b5af6f2c7f
|
绑定说明页面
|
9 years ago |
|
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
9 years ago |
 cxt
|
fa07f2532f
|
题库弹框样式修改
|
9 years ago |
|
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
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
|
56452d69f4
|
侧导航字体大小，颜色更改
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
9 years ago |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
|
Tim
|
950b18c250
|
加入班级提示
|
9 years ago |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
9 years ago |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
|
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
9 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
|
Tim
|
be36755d95
|
代码合并页面
|
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
|
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
|
24a6aabb6b
|
新建项目说明列表圆点大小与间距调整
|
9 years ago |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
9 years ago |
|
daiao
|
4d3f4c358a
|
微信功能
|
9 years ago |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
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 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
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 |
