 huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
9 years ago |
 cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
9 years ago |
 Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
9 years ago |
 yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
9 years ago |
|
yuanke
|
589df7e498
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
5b73e7dc19
|
修改发布帖子标题的长度及班级动态中不显示头像
|
9 years ago |
|
Tim
|
6b4e25520d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
78123b5db7
|
iphone设备输入时，自动定位到输入框
|
9 years ago |
|
yuanke
|
bb2a1de98c
|
资源详情返回更多按钮BUG修改
|
9 years ago |
|
yuanke
|
fd2021a1fe
|
微信资源界面发送后返回处理
|
9 years ago |
|
yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
9 years ago |
|
huang
|
61fe0fc77c
|
项目讨论区发帖时 标题为空 内容为空给出提示
|
9 years ago |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
9 years ago |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
9 years ago |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
9 years ago |
|
yuanke
|
e473a18487
|
提交错分支 还原
|
9 years ago |
|
yuanke
|
55512f9eb2
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
Tim
|
bbc0277d39
|
iphone端输入框js控制
|
9 years ago |
|
yuanke
|
965d8930dc
|
班级增加动态
|
9 years ago |
|
Tim
|
863ec9d396
|
iphone下输入框位置调整
|
9 years ago |
|
yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
75d81d5dba
|
前端判断是否绑定屏蔽
|
9 years ago |
|
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
9 years ago |
|
Tim
|
19becbfdf3
|
邀请内容更改
|
9 years ago |
|
Tim
|
2659b742fd
|
成员管理头像高度不一致；邀请内容格式调整
|
9 years ago |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
8ab003d5ee
|
分享页提交回复未关注公众号会跳到二维码界面
|
9 years ago |
guange
|
70d58ccf85
|
恢复授权页
|
9 years ago |
|
guange
|
4a88fbe3db
|
.
|
9 years ago |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
9 years ago |
|
Tim
|
6734904945
|
班级详情页面定位
|
9 years ago |
|
yuanke
|
2cfd876f2f
|
调试
|
9 years ago |
|
yuanke
|
3b42861a54
|
分享修改
|
9 years ago |
|
yuanke
|
822ca15c78
|
分享修改
|
9 years ago |
|
yuanke
|
c0dc070c15
|
分享修改
|
9 years ago |
|
yuanke
|
5c42cdb39c
|
分享内容时改为用户信息授权方式
|
9 years ago |
|
yuanke
|
6af15b7121
|
微信自动绑定用户修改
|
9 years ago |
|
yuanke
|
4e6c58ae37
|
动态点提交如果没绑定则自动创建一个帐号绑定，然后注册的时候将已绑定的用户信息修改为注册的信息
|
9 years ago |
|
yuanke
|
c26e2a9acc
|
私有动态BUG修改
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
9 years ago |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
9 years ago |
|
Tim
|
f5f88c5204
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
57737ff15d
|
微信细节优化
|
9 years ago |
|
Tim
|
e85f9373c8
|
点回复按钮回复框获取焦点；班级通知内容冗余；班级、项目邀请文字更友善；班级、项目中人数后箭头与人数对齐；邀请码提示增加间距；回复中@删除链接；二维码页面增加默认加入身份提示；公众号联系我们文字更改
|
9 years ago |
|
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
9 years ago |
|
yuanke
|
66357c4024
|
修改分享链接
|
9 years ago |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
9 years ago |
