guange
|
2a67ec5407
|
配置登录页菜单
|
9 years ago |
 yuanke
|
614e877e6e
|
微信项目和班级加入修改
|
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 |
 cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
Tim
|
b100651185
|
控制显示较多文字后显示省略号
|
9 years ago |
|
Tim
|
6342137972
|
微信动态文字过多显示省略号：中文省略号，英文单词可能被拆分显示省略号
|
9 years ago |
|
daiao
|
4d3f4c358a
|
微信功能
|
9 years ago |
|
Tim
|
4abce11004
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
3d7b7b513b
|
隐藏文字超出省略号显示
|
9 years ago |
|
yuanke
|
e478b050d1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
ce8f915d7e
|
分享修改成原来的
|
9 years ago |
|
Tim
|
a11dfcc9fb
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Tim
|
071ad88956
|
新建项目增加项目说明；动态多出文字以省略号显示； 文本内容单词不被强制拆分折行
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
yuanke
|
54e9367f71
|
分享标题内容修改
|
9 years ago |
|
yuanke
|
93844e757c
|
微信：角色配置后返回角色界面、修改开发为开放、创建项目发送消息项目名称修改
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
yuanke
|
cf65e6748b
|
微信项目相关功能开发，班级角色功能等
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
yuanke
|
653b98d832
|
微信增加项目相关内容
|
9 years ago |
|
yuanke
|
e6e8d73a66
|
修改动态详情
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
yuanke
|
04e9551450
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
6a871e2116
|
.
|
9 years ago |
|
yuanke
|
4f803ce0de
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
db7c267a47
|
微信单个项目动态
|
9 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
9 years ago |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
9 years ago |
|
yuanke
|
b9b9a867f4
|
项目
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
txz
|
216d590140
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
c4f4908c62
|
资源tab定位
|
9 years ago |
|
yuanke
|
cedd7ae520
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
9 years ago |
|
txz
|
7d2ba823e9
|
缓存动态页tab，详情返回到对应tab页
|
9 years ago |
|
txz
|
cef08a717c
|
课程名称过长时，邀请码无法点击bug
|
9 years ago |
|
yuanke
|
cdb7782849
|
除了issue 和news都增加了二级回复显示
|
9 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
9 years ago |
|
yuanke
|
0622978920
|
微信新用户注册后返回公众号
|
9 years ago |
|
yuanke
|
9ababc5aa4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
5a8f1b3d83
|
绑定成功后返回公众号
|
9 years ago |
|
txz
|
00c3e880e6
|
微信详情页面返回定位js
|
9 years ago |
|
yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
9 years ago |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
9 years ago |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
9 years ago |
|
yuanke
|
bf600e8f76
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
9 years ago |
|
txz
|
5b3c6cc012
|
输入框高度控制
|
9 years ago |
|
yuanke
|
80843d5084
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
9 years ago |
|
txz
|
bc0d8cd299
|
管理班级重命名字体变灰
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
9 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
9 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
guange
|
c14979d878
|
assets
|
9 years ago |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
9 years ago |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
9 years ago |
|
yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
9 years ago |
|
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
c02245adfb
|
邀请码分享
|
9 years ago |
|
yuanke
|
6385cc892f
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
9 years ago |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
txz
|
0d08d6b192
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
6063932840
|
课程管理中，对课程,班级名称编辑时，字体变灰
|
9 years ago |
|
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
9 years ago |
|
guange
|
a177c48a29
|
erge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
yuanke
|
2cc42a8f5a
|
微信修改资源更多问题
|
9 years ago |
|
guange
|
fff6f4b310
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
dd892993dd
|
assets
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
guange
|
0e415fffff
|
merge
|
9 years ago |
|
yuanke
|
b540ff7017
|
我的资源里增加更多按钮
|
9 years ago |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
9 years ago |
|
yuanke
|
d50fd40307
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
txz
|
e61aa9e0dc
|
回复框高度自动增减js同步
|
9 years ago |
|
yuanke
|
a5acc2641e
|
微信点赞保证各个切换之间点赞状态保持一致
|
9 years ago |
|
txz
|
78a6785b6b
|
微信回复框自动增高
|
9 years ago |
|
txz
|
717bbe2ffa
|
回复框多行提交后初始化
|
9 years ago |
|
yuanke
|
70ed5790b8
|
修改在动态详情点赞返回和点赞状态不一致的BUG
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
yuanke
|
374aa9918c
|
我的资源里面都显示未发布的，新建课程后返回会刷新数据
|
9 years ago |
|
guange
|
135b6ca64b
|
assets
|
10 years ago |
|
guange
|
7c98e0f392
|
merge
|
10 years ago |
|
guange
|
1413fe82dc
|
merge
|
10 years ago |
|
yuanke
|
c2166811eb
|
修改管理课程界面刷新显示问题
|
10 years ago |
|
yuanke
|
8d8de084ac
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
c6099177a4
|
修改微信发送资源平台不显示发送人的问题，删除班级提示文字不居中的问题等
|
10 years ago |
|
txz
|
ea5bd94e99
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
txz
|
9ae7461501
|
资源列表学生进入时也显示为课件；课程tab页样式替换
|
10 years ago |
|
guange
|
3c36e97ff1
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
3c23560d77
|
我的资源搜索无效
|
10 years ago |
|
guange
|
068c8967e1
|
新增班级时名称为1个字符时报错
|
10 years ago |
|
yuanke
|
3a2e2c1174
|
未命名课程暂不允许进行课程管理
|
10 years ago |
|
yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
10 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
10 years ago |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
10 years ago |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
10 years ago |
|
guange
|
a2ba65956c
|
.
|
10 years ago |
|
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
10 years ago |
|
guange
|
7859bf9c32
|
.
|
10 years ago |
|
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
10789d2505
|
added alert2
|
10 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
10 years ago |
|
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果，资源发送界面课程列表显示和课程列表界面保持一直
|
10 years ago |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
10 years ago |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
10 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
10 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
10 years ago |
|
guange
|
373e3d3422
|
merge
|
10 years ago |
|
guange
|
48fb02a2d6
|
管理课程
|
10 years ago |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
10 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
10 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
10 years ago |
|
guange
|
3c295ba5a1
|
merge
|
10 years ago |
|
guange
|
201abd6358
|
assets
|
10 years ago |
|
guange
|
b010ce2e61
|
发送课程完成
|
10 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
10 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
10 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
10 years ago |
|
guange
|
0bb5c8b5fb
|
注册绑定问题
|
10 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
10 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
10 years ago |
|
guange
|
e9f280b4aa
|
.
|
10 years ago |
|
guange
|
047903ddff
|
重构课程地址
|
10 years ago |
|
guange
|
1e6454efc0
|
加入我的资源
|
10 years ago |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
10 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
10 years ago |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
guange
|
c501af70ba
|
.
|
10 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
10 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
10 years ago |
|
guange
|
c39a982093
|
二维码
|
10 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
10 years ago |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
ec33569033
|
取消拖拽
|
10 years ago |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
10 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
10 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
10 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
10 years ago |
|
guange
|
e21f4e0b4d
|
merge
|
10 years ago |
|
guange
|
f9075e08ba
|
merge
|
10 years ago |
|
guange
|
d348981721
|
加入邀请码
|
10 years ago |
|
guange
|
52d4d36097
|
邀请码页面
|
10 years ago |
|
Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
10 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
10 years ago |
|
guange
|
7700445c17
|
加入课程
|
10 years ago |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
10 years ago |
|
guange
|
5a8de44c43
|
添加我的班级控制器
|
10 years ago |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
10 years ago |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
guange
|
b7230333dc
|
code获取修改
|
10 years ago |
|
guange
|
3f98562c0f
|
打包
|
10 years ago |
|
guange
|
61c117b8cb
|
重构老的代码，本地通过session来存放token, 所有的访问直接用老接口
|
10 years ago |
|
txz
|
b17b92cc3e
|
微信回复后先加载后启用回复按钮
|
10 years ago |
|
guange
|
9d19caa736
|
.
|
10 years ago |
|
guange
|
46018ad388
|
.
|
10 years ago |
|
guange
|
3582849ef3
|
.
|
10 years ago |
|
guange
|
a0c0a65d18
|
绑定用户迁移到接口
|
10 years ago |
|
guange
|
98c6548e39
|
重写登录和注册
|
10 years ago |
|
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
10 years ago |
|
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
10 years ago |
|
Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
10 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
10 years ago |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
10 years ago |
|
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
10 years ago |
|
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
10 years ago |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
10 years ago |
