 daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
10 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
|
10 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
|
10 years ago |
 huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
10 years ago |
 yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
10 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
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 |
|
daiao
|
4d3f4c358a
|
微信功能
|
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 |
|
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 |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
10 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
10 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
10 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
10 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
10 years ago |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
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 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
10 years ago |
|
txz
|
216d590140
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
txz
|
c4f4908c62
|
资源tab定位
|
10 years ago |
|
yuanke
|
cedd7ae520
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
10 years ago |
|
txz
|
7d2ba823e9
|
缓存动态页tab，详情返回到对应tab页
|
10 years ago |
|
txz
|
cef08a717c
|
课程名称过长时，邀请码无法点击bug
|
10 years ago |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
10 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
10 years ago |
|
yuanke
|
0622978920
|
微信新用户注册后返回公众号
|
10 years ago |
|
yuanke
|
9ababc5aa4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
5a8f1b3d83
|
绑定成功后返回公众号
|
10 years ago |
|
txz
|
00c3e880e6
|
微信详情页面返回定位js
|
10 years ago |
|
yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
10 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
|
10 years ago |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
10 years ago |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
10 years ago |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
10 years ago |
|
yuanke
|
bf600e8f76
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
10 years ago |
