 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
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
9 years ago |
 yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
9 years ago |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
9 years ago |
|
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
9 years ago |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
9 years ago |
|
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
9 years ago |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
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 |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
9 years ago |
|
Tim
|
28a29fa724
|
拖拽删除
|
9 years ago |
 daiao
|
5f969c6593
|
单位审核相关Bug修复
|
9 years ago |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
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 |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
 huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
9 years ago |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
9 years ago |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
yuanke
|
4c92e73cf1
|
根据http和https显示视频
|
9 years ago |
