 Tim
|
b796ac3b53
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/exercise/_student_table.html.erb
db/schema.rb
|
9 years ago |
 cxt
|
b3f738ee5d
|
与班级相关平台班级名称规范调整
|
9 years ago |
 daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
9 years ago |
 yuanke
|
7a71a7bd47
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
5b8ecf6657
|
微信头像刷新修改
|
9 years ago |
|
yuanke
|
8c71cf1946
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
dc051f0ec3
|
博客回复颜色修改
|
9 years ago |
|
yuanke
|
9e66bcb2ab
|
微信通知二级回复修改
|
9 years ago |
|
yuanke
|
5c626f94b5
|
微信二级回复框不显示修改
|
9 years ago |
|
yuanke
|
b43f8cf974
|
调试
|
9 years ago |
|
yuanke
|
8f3a73d400
|
调试
|
9 years ago |
|
yuanke
|
b6fdbc11a6
|
微信回复框修改
|
9 years ago |
|
yuanke
|
ab383031a6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
58037c3796
|
微信二级回复修改
|
9 years ago |
|
Tim
|
e5b1b920e6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
ca4c668c9b
|
邮箱提示位置调整
|
9 years ago |
|
yuanke
|
e74516cb68
|
微信修改个人资料
|
9 years ago |
|
Tim
|
031ba38655
|
性别选框样式调整
|
9 years ago |
|
yuanke
|
8584d1dccb
|
修改微信二级回复回复框的BUG
|
9 years ago |
|
Tim
|
216c834a40
|
微信修改资料select框去边框；二级回复显隐点击效果更改
|
9 years ago |
|
cxt
|
ab0863c9fb
|
平台的邀请码提示
|
9 years ago |
|
yuanke
|
1109eba460
|
微信上传图片功能先屏蔽
|
9 years ago |
|
yuanke
|
18fbf305c1
|
微信上传头像大小限制为1M
|
9 years ago |
|
Tim
|
2bb2a64dde
|
上传头像按钮和头像重合，并使上传按钮有效
|
9 years ago |
|
cxt
|
0ae4d26ec0
|
课程大纲的内容区域应该和下面的回复区域的宽度一致
|
9 years ago |
|
yuanke
|
d8a4eb56cf
|
微信上传头像修改
|
9 years ago |
|
yuanke
|
133b8af6ca
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c234a8d2cb
|
个人资料修改功能
|
9 years ago |
|
Tim
|
95824e3b6b
|
新建课程增加名称正确错误示例，课程说明
|
9 years ago |
|
Tim
|
99e63b1477
|
班级推荐数字block颜色字体更改；测验学号超出省略号显示
|
9 years ago |
|
Tim
|
01246f65ba
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
bd7cd7e244
|
二级回复点击显隐效果
|
9 years ago |
|
yuanke
|
c9c63eeb85
|
微信修改资料后台代码
|
9 years ago |
|
Tim
|
96e7d14060
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
05170c43ed
|
微信动态详情二级回复
|
9 years ago |
|
cxt
|
7123c66481
|
课程列表中：点击课程的名称就弹出新的tab页，进入课程的页面
|
9 years ago |
|
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
|
9 years ago |
|
yuanke
|
f540ac282d
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
Tim
|
92ae8865f0
|
删注释
|
9 years ago |
|
Tim
|
77c727e18a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
7fe1394403
|
ios自动定位输入框
|
9 years ago |
|
yuanke
|
6571b94bf1
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
ed7308969c
|
微信帖子删除后显示
|
9 years ago |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
9 years ago |
|
Tim
|
d0a2ea02f2
|
学生列表名字学号过长省略号显示；课程教师团队名称过长省略号显示
|
9 years ago |
|
Tim
|
9e317c4a8f
|
二级回复英文单词过长不折行
|
9 years ago |
|
Tim
|
0974153364
|
课程加入路径显示
|
9 years ago |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
9 years ago |
|
yuanke
|
12f854f31b
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
a6bb19eb60
|
微信动态回复增加点赞
|
9 years ago |
|
Tim
|
2316b3fe7b
|
回复添加点赞
|
9 years ago |
|
yuanke
|
5cda2292d0
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
5d47ee0c43
|
修改项目班级动态BUG
|
9 years ago |
|
Tim
|
0dff52ff09
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
40f5510195
|
侧导航文字和按钮不重合
|
9 years ago |
|
yuanke
|
aaa263f01e
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
0a398b38da
|
修改按钮颜色
|
9 years ago |
|
Tim
|
4d93b860f9
|
作品信息确认时，描述文字折行
|
9 years ago |
|
Tim
|
d080f0bb16
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
Tim
|
4c64e883ea
|
加入班级、项目时，增加获取邀请码提示
|
9 years ago |
|
yuanke
|
11ed1ea345
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
Tim
|
76b7469f75
|
课程列表icon缩小
|
9 years ago |
|
Tim
|
27a2da8b7b
|
意见反馈增加二维码
|
9 years ago |
|
yuanke
|
a6241afe04
|
.
|
9 years ago |
|
yuanke
|
251fd36748
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
d4f8bd29f4
|
班级项目成员管理BUG修改
|
9 years ago |
 huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
9 years ago |
|
Tim
|
742100d9b5
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
2251869881
|
iphone下视角滚动
|
9 years ago |
|
yuanke
|
8644ad178c
|
修复班级项目 删除成员的BUG
|
9 years ago |
|
yuanke
|
c3c2516e6b
|
微信班级、项目增加删除成员和退出功能
|
9 years ago |
|
daiao
|
548a263f0f
|
1.修复项目新闻发送至其他项目后，位于讨论区下的bug
2.资料未完善情况下，“修改资料”可操作
3.组织成员列表增加分页功能（配置成员页面分页为完成）
4.修复回复表情显示不对
|
9 years ago |
|
cxt
|
9b3e1e0275
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
cxt
|
9c327fe05e
|
at符号前面是标点符号或没有空格还是弹出用户列表。
|
9 years ago |
|
Tim
|
eda735db58
|
footer文字居中
|
9 years ago |
|
Tim
|
d11f673711
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
ec15474c3a
|
成员管理更改时，确定按钮样式变更
|
9 years ago |
|
yuanke
|
6c5eaf2779
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
292e778a8c
|
微信班级项目增加删除和退出功能
|
9 years ago |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
9 years ago |
|
Tim
|
48f110bbc8
|
新增退出项目，成员管理删除
|
9 years ago |
|
Tim
|
e0fed38f1d
|
新增退出班级及删除成员
|
9 years ago |
|
yuanke
|
e37a2fee1e
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
b4a5179a1b
|
修改班级成员管里的配置返回后显示空白及@issue链接无效的问题
|
9 years ago |
|
Tim
|
14ece14b78
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
bc1caf3d54
|
表情处理
|
9 years ago |
|
yuanke
|
4e312595fe
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
8a6ad89973
|
issue指向改变才发微信消息，增加微信动态里来源链接，@增加微信消息，菜单去掉加入班级和项目等
|
9 years ago |
|
huang
|
bbe44b3957
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
Tim
|
e30416f6b3
|
手机表情处理
|
9 years ago |
|
huang
|
ee2ae456ac
|
unresolved issues for sonar
|
9 years ago |
|
Tim
|
ac0cc37fe4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
ea0211c9ca
|
组织搜索成员时，页数过多折行问题
|
9 years ago |
|
cxt
|
4ff45c15a3
|
还原质量分析的代码
|
9 years ago |
|
cxt
|
acb18ca4c6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
3c5afb2b4f
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
Tim
|
a8d551105b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
64b7aedd1c
|
footer部分logo与链接替换更新
|
9 years ago |
|
cxt
|
1e169985a4
|
访问计数的颜色调整
|
9 years ago |
|
cxt
|
95ec047653
|
班级名称过长时，动态中标题显示与动态编辑图标按钮重叠
|
9 years ago |
|
Tim
|
a467338161
|
iphone定位js
|
9 years ago |
|
huang
|
a6f9c3375e
|
代码质量分析加入“未解决质量问题数”
|
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 |
