guange
|
b010ce2e61
|
发送课程完成
|
9 years ago |
 yuanke
|
70e26927cb
|
班级中的课程字样改为班级
|
9 years ago |
 cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
guange
|
3b383dfa65
|
老师课程界面
|
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
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
|
guange
|
657e506071
|
.
|
9 years ago |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
|
guange
|
485d0e3743
|
ticket处理
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
guange
|
fc5895e74f
|
.
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
dab24567f2
|
微信模板消息
|
9 years ago |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
9 years ago |
|
cxt
|
b72ad364db
|
微信模板消息：用户绑定成功、作业消息、个人留言、班级通知
|
9 years ago |
|
cxt
|
13676ec9c3
|
微信的链接修改
|
9 years ago |
|
cxt
|
e62a4cc646
|
绑定新的微信公众号
|
9 years ago |
 huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
9 years ago |
|
cxt
|
151661830f
|
微信模板消息的样式
|
9 years ago |
|
cxt
|
9a6ea9757d
|
微信模板消息的颜色、去掉模板消息的最后一行
|
9 years ago |
|
cxt
|
aed3818273
|
点击模板消息跳到微信详情页面
|
10 years ago |
|
cxt
|
d33f839b95
|
中文字符
|
10 years ago |
|
cxt
|
76cfa83666
|
微信模板消息接口
|
10 years ago |
|
cxt
|
c6d203d186
|
低版本的谷歌浏览器无法修改课程密码
|
10 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
10 years ago |
|
cxt
|
17aeff1587
|
复制学期时密码修改无效
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
huang
|
0ac4821f14
|
修改密码导航栏错误
|
10 years ago |
|
huang
|
dbadbf8621
|
修改密码gitlab同步
|
10 years ago |
 lizanle
|
34a2c2c90d
|
课程创建属性添加 是否允许学生上传资源
|
10 years ago |
|
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
10 years ago |
|
lizanle
|
e9a0334ab1
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
4ffafff7c4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/services/courses_service.rb
|
10 years ago |
|
lizanle
|
8ffbe8f300
|
course manager can not apply to join that course
|
10 years ago |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
10 years ago |
 ouyangxuhua
|
1963434242
|
解决搜索课程后，点击加入按钮无反应的bug
|
10 years ago |
|
lizanle
|
348a4df8d8
|
合并出错
|
10 years ago |
|
lizanle
|
80ec5b0b50
|
合并出错
|
10 years ago |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
f5a498a595
|
1.加入课程申请发送邮件；
2.解决360浏览器不能正确显示“重新评阅了作品”消息的问题
|
10 years ago |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
10 years ago |
|
lizanle
|
479b23a1fd
|
重复加入问题给出提示
并不发送消息
不允许重复发送相同的申请
点击确定自动关闭
|
10 years ago |
|
lizanle
|
b448e1a4c5
|
课程加入消息错误
|
10 years ago |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
10 years ago |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
10 years ago |
|
lizanle
|
a817c3b81e
|
添加身份
|
10 years ago |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
lizanle
|
a4734bb135
|
首页动态优化
|
10 years ago |
|
lizanle
|
c8cb730397
|
首页动态优化
|
10 years ago |
|
lizanle
|
8350d5f10b
|
首页动态优化
|
10 years ago |
|
lizanle
|
987ff98141
|
课程按更新时间排序
|
10 years ago |
|
lizanle
|
ad8c439e2b
|
获取作业列表有问题
|
10 years ago |
|
lizanle
|
75ad419e85
|
修改一些小bug
|
10 years ago |
|
lizanle
|
759e68621f
|
讨论区列表api
讨论区某主题详细 api
回复 某主题 api
|
10 years ago |
|
lizanle
|
c05a87ca37
|
总平均分改为总分
活跃度排名 总分排名 在首页 和 在具体的页面 排序不一致的bug
|
10 years ago |
|
lizanle
|
77f948ea63
|
总平均分改为总分
|
10 years ago |
|
lizanle
|
49b1b11d7b
|
去掉已经过时的代码
|
10 years ago |
|
lizanle
|
8d7faaced6
|
登录api修改
活跃值，平均成绩 是否可以加载 需要计算 最大值
|
10 years ago |
|
lizanle
|
1b1cce615d
|
回复通知api
活跃排名api
其他api的修改
|
10 years ago |
|
lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看，
获取作业的匿评率
|
10 years ago |
|
lizanle
|
c5e298d24e
|
停止匿评 api
|
10 years ago |
|
lizanle
|
5c648c9284
|
Attachment添加file_dir 属性
|
10 years ago |
|
lizanle
|
fe55258349
|
获取匿评状态的解释 api
开启匿评 api
|
10 years ago |
|
lizanle
|
2fe18787a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
9eab8b92ca
|
动态 api 隐藏 资源 讨论区
|
10 years ago |
|
lizanle
|
664770c63f
|
课程动态api改变
查看学生作业总平均分列表
|
10 years ago |
 sw
|
7338f0d44e
|
未完善个人资料的用户创建可以报错
|
10 years ago |
|
lizanle
|
416dee2d30
|
课程动态 api改版
|
10 years ago |
|
lizanle
|
09b6f1d787
|
修改news api
|
10 years ago |
|
lizanle
|
f32c76c7a2
|
字段名字错误
|
10 years ago |
|
lizanle
|
e5082ff489
|
新版课程动态 课程作业展示
|
10 years ago |
|
lizanle
|
d73a2c1003
|
课程动态新版api
|
10 years ago |
|
lizanle
|
7d76b20574
|
作业那块逻辑修改，对于作业的学生提问以及回复功能需要取消
|
10 years ago |
 yutao
|
2e7c6c4afb
|
修复bug#2725 :用户搜索--默认用户名和姓名一起匹配
|
10 years ago |
|
lizanle
|
5347d83f8f
|
用户搜索bug
|
10 years ago |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
lizanle
|
849af9b04b
|
课程评论添加上拉分页
|
10 years ago |
|
lizanle
|
ad99cb8535
|
与我相关 查看相关的详细内容
|
10 years ago |
|
huang
|
1b5c41b3ad
|
邮件配置
|
10 years ago |
|
lizanle
|
10e24bebd5
|
动态首页改变
|
10 years ago |
|
lizanle
|
3318d11c6d
|
个人留言
|
10 years ago |
|
lizanle
|
6353a2e2c8
|
留言分页
|
10 years ago |
|
lizanle
|
8e04b4e565
|
回复留言
|
10 years ago |
|
lizanle
|
d6fe4082af
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
dced5f328e
|
用户留言列表api
给用户留言 api
|
10 years ago |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
10 years ago |
|
lizanle
|
e1dd4823d5
|
课程通知发布api
|
10 years ago |
|
lizanle
|
a047bd3d18
|
课程作业发布功能
设置教辅功能
学生列表及成绩查看功能
|
10 years ago |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
10 years ago |
|
lizanle
|
de921be762
|
学生列表老师列表报key not find:realname
|
10 years ago |
|
lizanle
|
74c09f45d3
|
课程课件搜索 课程学生搜索
|
10 years ago |
|
lizanle
|
c353398d65
|
课程学生列表功能
|
10 years ago |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
10 years ago |
|
huang
|
0484692b47
|
缺陷显示页面虚线多余
|
11 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
11 years ago |
|
lizanle
|
e4597f9ccc
|
添加真名
|
11 years ago |
|
lizanle
|
45d5f9e58b
|
课程搜索按时间倒序排序
|
11 years ago |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
11 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
11 years ago |
|
lizanle
|
a7f1026828
|
current_user判空
|
11 years ago |
|
lizanle
|
b3b0461a42
|
已经被关注的人就不显示
|
11 years ago |
|
lizanle
|
5562456a85
|
学生提问数的修改
|
11 years ago |
|
lizanle
|
66a7d267c8
|
工作单位不显示 2901
|
11 years ago |
|
lizanle
|
6612ae357a
|
提示要为中文
|
11 years ago |
|
lizanle
|
60838460fc
|
课程的创建动态也要显示
|
11 years ago |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
11 years ago |
|
guange
|
0118b10725
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
lizanle
|
552c27c51d
|
课程作业学生提问问题计数修改
|
11 years ago |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
sw
|
cb1fce32fe
|
配置课程
|
11 years ago |
 z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
11 years ago |
|
z9hang
|
28a61c2617
|
课程搜索接口无法搜到自己的私有课程问题
|
11 years ago |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
11 years ago |
|
z9hang
|
e165dd6572
|
修改编码
|
11 years ago |
|
z9hang
|
ed674d960c
|
课程动态国际化问题
|
11 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
11 years ago |
|
z9hang
|
14fe487835
|
将app个人课程动态接口中作业留言归类到更新了作业中
|
11 years ago |
|
z9hang
|
052afefa5e
|
用户课程动态按更新时间倒序排列
|
11 years ago |
|
z9hang
|
26adc13ca2
|
修改用户课程动态接口
|
11 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
11 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
11 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
11 years ago |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
11 years ago |
|
z9hang
|
d01aa5f15c
|
关注接口限制不能关注自己
|
11 years ago |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
11 years ago |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
11 years ago |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
11 years ago |
|
z9hang
|
7b5eb9db8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
11 years ago |
 alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
11 years ago |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
11 years ago |
|
z9hang
|
196ceff138
|
返回课程的接口补上当前用户是否为课程成员，课程老师信息
|
11 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
11 years ago |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
11 years ago |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
11 years ago |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
11 years ago |
|
z9hang
|
cc83b30fc6
|
修正搜索用户接口，添加课程动态接口
|
11 years ago |
|
z9hang
|
b1903dba11
|
添加课程留言接口
|
11 years ago |
|
z9hang
|
0dfa428377
|
手机ＡＰＩ添加回复留言接口
|
11 years ago |
|
z9hang
|
ef203ff40c
|
修正作业留言接口
|
11 years ago |
|
z9hang
|
d6813e5996
|
项目新闻报错问题，作业留言接口
|
11 years ago |
|
z9hang
|
d6b82c3549
|
修正课程通知评论接口
|
11 years ago |
