黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
10 years ago |
cxt
|
abdbfd87b0
|
班级的邀请码增加“停用”和“启用”功能,停用的邀请码不允许用户主动加入班级
|
10 years ago |
huang
|
66066e6899
|
commit导出方法及显示页面
|
10 years ago |
huang
|
5bc4c779ea
|
issue和commit_id关联
|
10 years ago |
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
10 years ago |
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
10 years ago |
yuanke
|
9720f84fce
|
js的自动转换URL函数autoUrl加上个异常处理
|
10 years ago |
cxt
|
4388b7625e
|
首页班级列表的归档
|
10 years ago |
cxt
|
f754ac870d
|
导航栏题库-发送:如图发送弹框中当鼠标移至下拉条时,鼠标光标不要显示成可以左右拉动的图标
|
10 years ago |
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
10 years ago |
yuanke
|
44724c6905
|
弹框BUG修改
|
10 years ago |
yuanke
|
d71ebb08b0
|
弹框BUG修复
|
10 years ago |
yuanke
|
9ef8f0f612
|
弹框BUG修改
|
10 years ago |
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
10 years ago |
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
10 years ago |
cxt
|
54f45f18a5
|
匿评设置的调整
|
10 years ago |
yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
ec5645fc66
|
完成项目动态中样式别别的地方冲突问题
|
10 years ago |
Tim
|
e3fc304d35
|
项目动态回复栏展开更多时,回复框宽度扩展问题
|
10 years ago |
cxt
|
51e422c1a6
|
个人留言、课程留言的主留言增加自动保存
|
10 years ago |
yuanke
|
8e35158fe9
|
增加统计功能
|
10 years ago |
cxt
|
86946f9d2c
|
鼠标放在自动保存“恢复”、“不恢复”上要变成手型
|
10 years ago |
Tim
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
10 years ago |
Tim
|
86de58f793
|
问卷问题增加支持折行输入功能;输入随文字高度自适应js;问卷折行输入按格式输出css支持及格式调整
|
10 years ago |
yuanke
|
89d91f69c2
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
yuanke
|
1620a13565
|
修改图片放大js的一个BUG
|
10 years ago |
cxt
|
ba4a1c64d9
|
作业动态的重构
|
10 years ago |
daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
10 years ago |
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
10 years ago |
daiao
|
27ad94eac2
|
组织配置界面,成员列表分页
|
10 years ago |
huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
10 years ago |
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
10 years ago |
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
|
10 years ago |
Tim
|
a8f30fe85f
|
个人主页,课程,项目头像、logo增加编辑按钮
|
10 years ago |
yuanke
|
82779c99ea
|
字符串去掉空白时,空格不去掉。
|
10 years ago |
Tim
|
083d5453d4
|
加入课程、项目弹框,在内容部分不能拖拽
|
10 years ago |
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
10 years ago |
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
10 years ago |
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
10 years ago |
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
10 years ago |
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
10 years ago |
cxt
|
0d86a28c54
|
我的作业
|
10 years ago |
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
10 years ago |
Tim
|
28a29fa724
|
拖拽删除
|
10 years ago |
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
10 years ago |
Tim
|
08b8e3f1cb
|
加入班级,项目弹框定位js重写
|
10 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
|
10 years ago |
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
10 years ago |