 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 |
|
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 |
|
huang
|
d7faed7f6d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
guange
|
70d58ccf85
|
恢复授权页
|
9 years ago |
|
huang
|
0c6e1b2ccb
|
版本库样式修改，显示全时间
|
9 years ago |
|
guange
|
4a88fbe3db
|
.
|
9 years ago |
|
huang
|
1b19d227f9
|
项目列表样式及连接
|
9 years ago |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
9 years ago |
|
huang
|
75971120f7
|
Merge branch 'develop' into rep_quality
|
9 years ago |
|
Tim
|
6734904945
|
班级详情页面定位
|
9 years ago |
|
Tim
|
5eb397aa2a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/login_tip.html
|
9 years ago |
|
Tim
|
bdeb8297cb
|
关注提示页面
|
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
|
d74924ff67
|
私有动态提示修改
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
yuanke
|
0d69fa0cc0
|
微信私有动态内容加上提示
|
9 years ago |
|
yuanke
|
61ffa58896
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
7c5240b386
|
微信 没登录动态回复会跳到绑定登录界面，私有内容需要是成员才能回复
|
9 years ago |
|
huang
|
56afad9242
|
质量分析列表中添加时间和版本
|
9 years ago |
|
Tim
|
8d753f55dc
|
班级、项目动态增加“私有内容，谨慎传播”提示
|
9 years ago |
|
Tim
|
b5af6f2c7f
|
绑定说明页面
|
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
|
fa07f2532f
|
题库弹框样式修改
|
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 |
|
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
9 years ago |
|
huang
|
867434531d
|
pull request 列表页面添加分页
|
9 years ago |
|
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
9 years ago |
|
Tim
|
5dd6244a34
|
pull request添加留言
|
9 years ago |
|
yuanke
|
b53979d91c
|
修改微信头像不显示的BUG，动态暂时全部去掉认证！
|
9 years ago |
|
yuanke
|
bd908af765
|
修改报错BUG
|
9 years ago |
|
yuanke
|
61ba668818
|
函数写错名称
|
9 years ago |
|
yuanke
|
57f3aaa9e8
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
9 years ago |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
9 years ago |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
9 years ago |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
Tim
|
e8d4bc0772
|
弹框可拖拽
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
9 years ago |
|
huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
Tim
|
be5e74897a
|
项目弹框位置调整
|
9 years ago |
|
Tim
|
cb6750cd01
|
输入时，忘记密码和绑定按钮重合的bug
|
9 years ago |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
9 years ago |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
9 years ago |
|
huang
|
b86b2299a7
|
fork分支选择 js
|
9 years ago |
|
huang
|
b297446778
|
select选择框
|
9 years ago |
|
yuanke
|
491b6fcb72
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bb46aa4745
|
微信点击已审批模版消息进入界面显示修改
|
9 years ago |
|
Tim
|
1335dc1b76
|
提示文字取消粗体
|
9 years ago |
|
Tim
|
28a29fa724
|
拖拽删除
|
9 years ago |
|
yuanke
|
d5df45e8fb
|
项目动态点入详情后返回需回到点入的项目动态处
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
yuanke
|
55afb84aef
|
模版消息标题加上句号，审核模版消息再次点击显示修改
|
9 years ago |
|
yuanke
|
e4a414e550
|
微信菜单跳入加入项目和班级界面点取消要能返回公众号界面
|
9 years ago |
|
yuanke
|
12a9c95c01
|
微信项目及班级邀请码相关BUG修改
|
9 years ago |
|
Tim
|
b8a40862ce
|
改变行代码格式化，不折行
|
9 years ago |
|
yuanke
|
3c2ab32121
|
微信动态分享修改
|
9 years ago |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
|
yuanke
|
4bae4527a2
|
微信分享URL修改
|
9 years ago |
|
yuanke
|
aaa1c01eed
|
微信动态分享图片修改
|
9 years ago |
|
yuanke
|
c0579de57d
|
微信分享内容修改
|
9 years ago |
|
yuanke
|
13d59be389
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
17c98eb9fe
|
微信分享修改
|
9 years ago |
|
Tim
|
7b6675ed6a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/join_project.html
|
9 years ago |
|
Tim
|
950b18c250
|
加入班级提示
|
9 years ago |
|
yuanke
|
29e707a88d
|
微信加入项目修改、二级回复三个回复时多了个边框BUG修改等
|
9 years ago |
|
Tim
|
a5fe620452
|
题库翻页居中对齐
|
9 years ago |
|
yuanke
|
a34272027e
|
微信菜单及项目班级审核修改
|
9 years ago |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
|
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
|
Tim
|
e7fa38e52c
|
pull request show页面
|
9 years ago |
|
yuanke
|
6ee6cdf28f
|
微信项目加入审核修改
|
9 years ago |
|
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
9 years ago |
|
yuanke
|
65719add19
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
4ab2427827
|
微信项目及课程申请审核相关功能
|
9 years ago |
|
guange
|
6f2b84570f
|
去除调试模式
|
9 years ago |
|
guange
|
56d6f4b9bc
|
定制分享内容
|
9 years ago |
|
guange
|
2a67ec5407
|
配置登录页菜单
|
9 years ago |
|
yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
9 years ago |
|
Tim
|
3e95b070d0
|
合并请求代码
|
9 years ago |
|
Tim
|
9af8757ceb
|
项目合并请求
|
9 years ago |
|
Tim
|
be36755d95
|
代码合并页面
|
9 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
9 years ago |
|
yuanke
|
fa43924330
|
微信项目二维码修改
|
9 years ago |
|
yuanke
|
f0cf7adcdf
|
加入项目邀请码
|
9 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
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 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
|
9 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
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
Tim
|
b100651185
|
控制显示较多文字后显示省略号
|
9 years ago |
|
Tim
|
9a3acdd1db
|
删除注释
|
9 years ago |
|
Tim
|
6342137972
|
微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号
|
9 years ago |
|
Tim
|
24a6aabb6b
|
新建项目说明列表圆点大小与间距调整
|
9 years ago |
|
Tim
|
9e6575211f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
