 yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
10 years ago |
guange
|
70d58ccf85
|
恢复授权页
|
10 years ago |
|
guange
|
4a88fbe3db
|
.
|
10 years ago |
 Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
10 years ago |
|
Tim
|
6734904945
|
班级详情页面定位
|
10 years ago |
|
yuanke
|
2cfd876f2f
|
调试
|
10 years ago |
|
yuanke
|
3b42861a54
|
分享修改
|
10 years ago |
|
yuanke
|
822ca15c78
|
分享修改
|
10 years ago |
|
yuanke
|
c0dc070c15
|
分享修改
|
10 years ago |
|
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
10 years ago |
|
yuanke
|
6af15b7121
|
微信自动绑定用户修改
|
10 years ago |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
10 years ago |
|
yuanke
|
c26e2a9acc
|
私有动态BUG修改
|
10 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
10 years ago |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
10 years ago |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
10 years ago |
|
Tim
|
f5f88c5204
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
57737ff15d
|
微信细节优化
|
10 years ago |
|
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
10 years ago |
 cxt
|
0ed508a887
|
题库预览弹窗的调整
|
10 years ago |
|
yuanke
|
66357c4024
|
修改分享链接
|
10 years ago |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
10 years ago |
|
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
10 years ago |
|
yuanke
|
bd908af765
|
修改报错BUG
|
10 years ago |
|
yuanke
|
61ba668818
|
函数写错名称
|
10 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
10 years ago |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
10 years ago |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
10 years ago |
 huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
10 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
10 years ago |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
10 years ago |
|
huang
|
b86b2299a7
|
fork分支选择 js
|
10 years ago |
|
huang
|
b297446778
|
select选择框
|
10 years ago |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
10 years ago |
|
Tim
|
28a29fa724
|
拖拽删除
|
10 years ago |
|
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
10 years ago |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
10 years ago |
|
yuanke
|
e4a414e550
|
微信菜单跳入加入项目和班级界面点取消要能返回公众号界面
|
10 years ago |
|
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
10 years ago |
|
yuanke
|
3c2ab32121
|
微信动态分享修改
|
10 years ago |
|
yuanke
|
4bae4527a2
|
微信分享URL修改
|
10 years ago |
|
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
10 years ago |
|
yuanke
|
c0579de57d
|
微信分享内容修改
|
10 years ago |
|
yuanke
|
17c98eb9fe
|
微信分享修改
|
10 years ago |
|
yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
10 years ago |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
10 years ago |
 daiao
|
5f969c6593
|
单位审核相关Bug修复
|
10 years ago |
|
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
10 years ago |
|
guange
|
6f2b84570f
|
去除调试模式
|
10 years ago |
|
guange
|
56d6f4b9bc
|
定制分享内容
|
10 years ago |
|
guange
|
2a67ec5407
|
配置登录页菜单
|
10 years ago |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
10 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
10 years ago |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
10 years ago |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
10 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
|
10 years ago |
|
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 |
|
Tim
|
b100651185
|
控制显示较多文字后显示省略号
|
10 years ago |
|
Tim
|
6342137972
|
微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号
|
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 |
|
txz
|
5b3c6cc012
|
输入框高度控制
|
10 years ago |
|
yuanke
|
80843d5084
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
10 years ago |
|
txz
|
bc0d8cd299
|
管理班级重命名字体变灰
|
10 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
10 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
10 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
10 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
10 years ago |
|
guange
|
c14979d878
|
assets
|
10 years ago |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
10 years ago |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
10 years ago |
|
yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
10 years ago |
|
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
c02245adfb
|
邀请码分享
|
10 years ago |
|
yuanke
|
6385cc892f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
10 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
txz
|
0d08d6b192
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
txz
|
6063932840
|
课程管理中，对课程,班级名称编辑时，字体变灰
|
10 years ago |
|
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
10 years ago |
|
guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
10 years ago |
|
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
dd892993dd
|
assets
|
10 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
10 years ago |
|
guange
|
0e415fffff
|
merge
|
10 years ago |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
10 years ago |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
10 years ago |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
10 years ago |
|
txz
|
e61aa9e0dc
|
回复框高度自动增减js同步
|
10 years ago |
|
yuanke
|
a5acc2641e
|
微信点赞保证各个切换之间点赞状态保持一致
|
10 years ago |
|
txz
|
78a6785b6b
|
微信回复框自动增高
|
10 years ago |
|
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
10 years ago |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
10 years ago |
