 daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
10 years ago |
 huang
|
ab4d85dcb7
|
组织500问题
|
10 years ago |
 cxt
|
27fa113de1
|
组织动态报500
|
10 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
|
10 years ago |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
10 years ago |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
10 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
10 years ago |
|
daiao
|
a55e64dfb3
|
保持组织动态用户名颜色与其他动态用户名颜色显示一直
|
10 years ago |
 Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
10 years ago |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
10 years ago |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
10 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
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 |
 yuanke
|
a732efa6c6
|
1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复
|
10 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
10 years ago |
|
cxt
|
2956b08f40
|
分组作业：去掉组员“追加附件”的入口
|
10 years ago |
|
yuanke
|
a7ecfba23b
|
Merge branch 'yuanke_org' into develop
|
10 years ago |
|
yuanke
|
547d5409bb
|
组织中的课程字样改为班级
|
10 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
10 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
5c2ac3e02f
|
修改删除组织成员跨域的BUG
|
10 years ago |
|
Tim
|
a3738c4cb2
|
新建组织，题库和资源库弹框样式检查
|
10 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
10 years ago |
|
yuanke
|
c61c14fa97
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
10 years ago |
|
yuanke
|
64d87b7398
|
修改组织添加成员的BUG
|
10 years ago |
|
yuanke
|
2a971c3bc6
|
修改有的组织添加成员的BUG
|
10 years ago |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
10 years ago |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
10 years ago |
|
huang
|
fce93de296
|
500问题
|
10 years ago |
|
huang
|
6af0bf7b83
|
组织样式
|
10 years ago |
|
yuanke
|
811afbdf33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
7d68df79a0
|
组织合并凌彬代码500问题
|
10 years ago |
|
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
10 years ago |
|
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
10 years ago |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
10 years ago |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
10 years ago |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
10 years ago |
|
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
10 years ago |
|
huang
|
9d3bb44682
|
简洁模式
|
10 years ago |
|
huang
|
928d71500d
|
门户模式--组织栏目没有动态时显示位置
|
10 years ago |
|
huang
|
d18094cc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
10 years ago |
|
yuanke
|
7504b353c9
|
组织报500问题修复
|
10 years ago |
|
huang
|
871a4d2d7b
|
组织设为首页500问题
|
10 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
10 years ago |
