 huang
|
ee2ae456ac
|
unresolved issues for sonar
|
9 years ago |
 Tim
|
d940f957ec
|
css问题更改
|
9 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
|
9 years ago |
|
huang
|
420a17a7e4
|
资源提示统计数字及权限修改
|
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 |
|
Tim
|
3f7c623163
|
新增资源提示框
|
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 |
|
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整；测导航数字大小背景调整
|
9 years ago |
|
Tim
|
3e78dec32a
|
将课程、项目公用类放至public.css中
|
9 years ago |
|
cxt
|
cb5e5f18ce
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
9 years ago |
|
Tim
|
df1039cd09
|
项目收藏按钮位置调整
|
9 years ago |
|
yuanke
|
ea238cd407
|
微信班级发布问题改为发起讨论
|
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 |
|
Tim
|
ae09d7ff27
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
bb935e42a8
|
发帖时，标题字符限制；发布按钮不遮住输入框
|
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 |
|
yuanke
|
3673ed3f1d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
4932b9fad8
|
班级留言不显示
|
9 years ago |
|
huang
|
61fe0fc77c
|
项目讨论区发帖时 标题为空 内容为空给出提示
|
9 years ago |
|
yuanke
|
f35c3e8528
|
微信新闻、issue增加二级回复等
|
9 years ago |
|
Tim
|
7682a4d45d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
a13ec60173
|
修复无效的css
|
9 years ago |
|
cxt
|
7d89f69981
|
班级和项目收藏夹
|
9 years ago |
|
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
yuanke
|
f8dfe85156
|
项目issue增加模版消息
|
9 years ago |
|
Tim
|
57ecffc130
|
班级新增收藏功能
|
9 years ago |
|
yuanke
|
c26f59e697
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c612104fab
|
微信增加发帖功能
|
9 years ago |
|
Tim
|
c8c5f5d415
|
iphone下flex无效
|
9 years ago |
|
Tim
|
7d671c7758
|
调整输入框padding值
|
9 years ago |
|
Tim
|
34acb1aa2f
|
课程项目增加发布按钮
|
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 |
|
Tim
|
4f3f6358fc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
a846eda77b
|
输入框padding调整；发帖样式新增
|
9 years ago |
|
yuanke
|
75d81d5dba
|
前端判断是否绑定屏蔽
|
9 years ago |
