 huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
10 years ago |
 cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
10 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
10 years ago |
 Tim
|
9e6575211f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
4e5f3e56c7
|
新建项目说明文字居中
|
10 years ago |
 yuanke
|
78e44617e3
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
Tim
|
4abce11004
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
3d7b7b513b
|
隐藏文字超出省略号显示
|
10 years ago |
|
Tim
|
43498e79e8
|
项目说明居中对齐
|
10 years ago |
|
yuanke
|
18862fdee9
|
编辑课程文字修改
|
10 years ago |
|
yuanke
|
e478b050d1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
ce8f915d7e
|
分享修改成原来的
|
10 years ago |
|
Tim
|
a11dfcc9fb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
10 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
10 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
10 years ago |
|
yuanke
|
f1859151bc
|
修改新建项目、新建课程中的文字
|
10 years ago |
|
yuanke
|
8bf69a2e4d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
10 years ago |
|
Tim
|
6b89460295
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
37e29404ba
|
微信班级管理图标可点击区域放大
|
10 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
|
10 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
10 years ago |
|
Tim
|
4bbd72ecd2
|
发送班级页面发送按钮定位
|
10 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
10 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
10 years ago |
|
Tim
|
318ef2bb30
|
微信定位高度
|
10 years ago |
|
Tim
|
40bb59ea9d
|
微信定位
|
10 years ago |
|
Tim
|
6078db7e39
|
sy_public.css样式重用处理
|
10 years ago |
|
Tim
|
9d7fa86cb6
|
syllabus.css样式重用处理
|
10 years ago |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
10 years ago |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
10 years ago |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
10 years ago |
|
cxt
|
4422bb1bc0
|
课程列表中的私有班级不可访问
|
10 years ago |
|
Tim
|
a2acbba34a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
e3057566c8
|
各详情页面内容和二级回复样式调整；回复详情内容不显示bug
|
10 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
10 years ago |
|
yuanke
|
e6e8d73a66
|
修改动态详情
|
10 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
10 years ago |
|
yuanke
|
04e9551450
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
guange
|
6a871e2116
|
.
|
10 years ago |
|
yuanke
|
4f803ce0de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
db7c267a47
|
微信单个项目动态
|
10 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
10 years ago |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
10 years ago |
|
yuanke
|
b9b9a867f4
|
项目
|
10 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
10 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
10 years ago |
