 ouyangxuhua
|
1881e18742
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
bb7bcf46a9
|
1.设置首页后，跳转至组织首页
|
10 years ago |
 huang
|
42f5b86d95
|
添加字段删除课程
|
10 years ago |
|
huang
|
7c34122ff6
|
fork的时候如果用户没有同步，则自动同步
|
10 years ago |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
 lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
10 years ago |
|
ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
ouyangxuhua
|
5198f4dde4
|
Merge branch 'dev_hjq' into develop
|
10 years ago |
|
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
10 years ago |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
10 years ago |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
10 years ago |
|
lizanle
|
ee661bb6d4
|
input光光标到最后的折中解决方案
|
10 years ago |
|
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
lizanle
|
9e01f02a66
|
作业题目统一改为作业标题
作业匿评截止消息改造
|
10 years ago |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
10 years ago |
|
lizanle
|
ad2d9fa374
|
添加对帖子的全文搜索
|
10 years ago |
 cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
c8f4149206
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
10 years ago |
|
huang
|
5eb249515c
|
版本库显示样式
|
10 years ago |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
9f30c7a44e
|
如果用户没有登陆，不能在组织页面中，增加项目或课程。
|
10 years ago |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
10 years ago |
|
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
10 years ago |
|
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
10 years ago |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
10 years ago |
|
cxt
|
79ce5c9ac5
|
匿评已结束时作业动态的作品按钮显示成“查看作品”
|
10 years ago |
|
cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
10 years ago |
|
cxt
|
0472a5ed0c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
10 years ago |
|
huang
|
ab1c945a30
|
修改版本库库权限
自己不能fork自己的项目
|
10 years ago |
|
huang
|
f67386e8a0
|
组织模块丢失代码还原
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
bd3d0547f5
|
组织样式修改
|
10 years ago |
|
ouyangxuhua
|
4c9d9dee35
|
组织首页样式
|
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
|
5b0bdb5069
|
修改组织栏目的内容及样式
|
10 years ago |
|
huang
|
c7058e6bbf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
4cb58211ad
|
邮件消息提示语修改
|
10 years ago |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
10 years ago |
|
huang
|
6fad26cabf
|
去死奥placebold
|
10 years ago |
|
cxt
|
8b160b1c38
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
10 years ago |
|
huang
|
120a7274d3
|
fork样式显示
|
10 years ago |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
10 years ago |
|
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
10 years ago |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
b6edabed9c
|
修改角色
|
10 years ago |
|
cxt
|
8fe53468e1
|
作品追加附件
|
10 years ago |
 Tim
|
dfa9b4cf74
|
学生列表调整
|
10 years ago |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
10 years ago |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
c1747ab217
|
fork重名，提交
|
10 years ago |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
10 years ago |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
10 years ago |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
10 years ago |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
10 years ago |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
10 years ago |
|
huang
|
057d9a3337
|
0
|
10 years ago |
|
huang
|
8d891a9faa
|
fork权限
|
10 years ago |
|
huang
|
b91c65798d
|
课程成员添加设置
|
10 years ago |
|
cxt
|
4e9e7543ba
|
chrome浏览器点击保存测验头部信息无反应
|
10 years ago |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
10 years ago |
|
cxt
|
fd51b02e16
|
添加修订附件
|
10 years ago |
|
cxt
|
77e96af78f
|
还原分组作业
|
10 years ago |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
ouyangxuhua
|
cf41b13f3a
|
增加组织表和组织课程表的关联删除
|
10 years ago |
|
ouyangxuhua
|
9baeb850a3
|
在管理员界面中，添加组织的编辑和删除功能。
|
10 years ago |
|
ouyangxuhua
|
95b071a8f7
|
修复组织模块的bug
|
10 years ago |
|
lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
10 years ago |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
10 years ago |
|
lizanle
|
2f0895c2c2
|
发送资源成功给出提示
发送资源默认为发送课程
|
10 years ago |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
10 years ago |
|
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
10 years ago |
|
lizanle
|
46ad5f45c1
|
搜索结果下一页样式不对
|
10 years ago |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
10 years ago |
|
lizanle
|
d4823e7c8b
|
贴吧更新时间
|
10 years ago |
|
lizanle
|
304cc078a7
|
去掉警示的感叹号
|
10 years ago |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
10 years ago |
|
ouyangxuhua
|
0aba11f175
|
解决组织配置在360浏览器显示不兼容的问题
|
10 years ago |
|
lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2bca65025
|
分片默认为5
|
10 years ago |
guange
|
52a0da83c4
|
匿名用户留言问题.
|
10 years ago |
|
huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
3750a49b65
|
修复组织编辑下拉框的bug
|
10 years ago |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
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 |
