 daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
10 years ago |
 yuanke
|
f540ac282d
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
 Tim
|
92ae8865f0
|
删注释
|
10 years ago |
|
Tim
|
77c727e18a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
7fe1394403
|
ios自动定位输入框
|
10 years ago |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
yuanke
|
ed7308969c
|
微信帖子删除后显示
|
10 years ago |
 cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
10 years ago |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
10 years ago |
|
yuanke
|
5d47ee0c43
|
修改项目班级动态BUG
|
10 years ago |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
yuanke
|
a6241afe04
|
.
|
10 years ago |
|
yuanke
|
251fd36748
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
d4f8bd29f4
|
班级项目成员管理BUG修改
|
10 years ago |
 huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
10 years ago |
|
Tim
|
742100d9b5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
2251869881
|
iphone下视角滚动
|
10 years ago |
|
yuanke
|
8644ad178c
|
修复班级项目 删除成员的BUG
|
10 years ago |
|
yuanke
|
c3c2516e6b
|
微信班级、项目增加删除成员和退出功能
|
10 years ago |
|
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后，位于讨论区下的bug
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
|
10 years ago |
|
Tim
|
d11f673711
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
ec15474c3a
|
成员管理更改时，确定按钮样式变更
|
10 years ago |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
10 years ago |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
10 years ago |
|
yuanke
|
e37a2fee1e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
10 years ago |
|
Tim
|
14ece14b78
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
bc1caf3d54
|
表情处理
|
10 years ago |
|
yuanke
|
4e312595fe
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
10 years ago |
|
Tim
|
e30416f6b3
|
手机表情处理
|
10 years ago |
|
Tim
|
a467338161
|
iphone定位js
|
10 years ago |
|
huang
|
803bd9819a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/css/public.css
|
10 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
|
10 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
|
10 years ago |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
10 years ago |
|
Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
10 years ago |
|
yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
10 years ago |
|
yuanke
|
589df7e498
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
5b73e7dc19
|
修改发布帖子标题的长度及班级动态中不显示头像
|
10 years ago |
|
Tim
|
6b4e25520d
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
Tim
|
78123b5db7
|
iphone设备输入时，自动定位到输入框
|
10 years ago |
|
yuanke
|
bb2a1de98c
|
资源详情返回更多按钮BUG修改
|
10 years ago |
|
yuanke
|
fd2021a1fe
|
微信资源界面发送后返回处理
|
10 years ago |
|
yuanke
|
aa11f39b2d
|
Merge branch 'develop' into weixin_guange
Conflicts:
public/assets/wechat/class.html
public/javascripts/wechat/controllers/class.js
|
10 years ago |
|
huang
|
61fe0fc77c
|
项目讨论区发帖时 标题为空 内容为空给出提示
|
10 years ago |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
10 years ago |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
10 years ago |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
10 years ago |
|
yuanke
|
e473a18487
|
提交错分支 还原
|
10 years ago |
