 huang
|
670df76c70
|
注释掉项目邀请加入功能
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
 ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
10 years ago |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
ouyangxuhua
|
108865968b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
12c57e7e4b
|
将Jquery引入组织首页
|
10 years ago |
|
huang
|
9d68fd7d28
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
37a7abea53
|
组织首页
|
10 years ago |
|
ouyangxuhua
|
01b82e59d8
|
实现组织首页功能
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
 lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
10 years ago |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
10 years ago |
|
huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
10 years ago |
|
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
10 years ago |
|
lizanle
|
7eb5d2a8fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
8bd9c0c7af
|
tip
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
lizanle
|
29a8d1b9f5
|
tip
|
10 years ago |
|
huang
|
d67fc18988
|
英雄榜、贡献榜显示真实姓名
为零的时候不显示
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
061a1f602a
|
效果实现
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
8728557813
|
老师和学生统计数目区分
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
lizanle
|
60fda5e391
|
火狐MathJax显示公式错误，还是不能不用图形字体
|
10 years ago |
|
lizanle
|
6a59e39ef1
|
允许学生上传资源
|
10 years ago |
|
lizanle
|
8e55c98ccf
|
MathJax不允许使用图片资源，不然图片太多了。有30000个左右
|
10 years ago |
