 cxt
|
cc2fe6108a
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
5e697e5367
|
作业的回复
|
9 years ago |
 txz
|
0d24de7198
|
详情页面回复
|
9 years ago |
|
cxt
|
7dccb0d963
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
cxt
|
88c39512b9
|
journal的修改
|
9 years ago |
|
txz
|
58e5fe85c3
|
issue 详情页面
|
9 years ago |
|
txz
|
4902361b3f
|
冲突解决
|
9 years ago |
|
txz
|
596bf641ac
|
最新动态各详情页面
|
9 years ago |
|
cxt
|
b3b0488bf5
|
动态点击更多
|
9 years ago |
|
cxt
|
66e80d034f
|
issue只取回复
|
9 years ago |
 Yiang Gan
|
869810b3a0
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Yiang Gan
|
af2bd66847
|
回复api
|
9 years ago |
|
Yiang Gan
|
4088fb9cb4
|
课程作业详情页面
|
9 years ago |
|
cxt
|
e4db141604
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Yiang Gan
|
03abdbb68b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
9 years ago |
|
Yiang Gan
|
392c5708f2
|
作业详情页面
|
9 years ago |
|
Yiang Gan
|
6c831b6811
|
解决冲突
|
9 years ago |
|
Yiang Gan
|
313d415a15
|
详情api
|
9 years ago |
|
Tim
|
77e11fe0fe
|
微信最新动态修改
|
9 years ago |
|
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
9 years ago |
|
cxt
|
c8142b3ee5
|
作业api
|
9 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
9 years ago |
|
Tim
|
43de1a21b1
|
issues api 列表
|
9 years ago |
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
 huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
10 years ago |
 lizanle
|
f521ca424d
|
首页动态优化
|
10 years ago |
|
lizanle
|
c8cb730397
|
首页动态优化
|
10 years ago |
|
lizanle
|
8350d5f10b
|
首页动态优化
|
10 years ago |
|
lizanle
|
75ad419e85
|
修改一些小bug
|
10 years ago |
|
lizanle
|
759e68621f
|
讨论区列表api
讨论区某主题详细 api
回复 某主题 api
|
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
|
662fc02a80
|
news author解析
|
10 years ago |
|
lizanle
|
426d382ee5
|
学生作业模型
|
10 years ago |
|
lizanle
|
9eab8b92ca
|
动态 api 隐藏 资源 讨论区
|
10 years ago |
|
lizanle
|
664770c63f
|
课程动态api改变
查看学生作业总平均分列表
|
10 years ago |
|
lizanle
|
416dee2d30
|
课程动态 api改版
|
10 years ago |
|
lizanle
|
09b6f1d787
|
修改news api
|
10 years ago |
|
lizanle
|
a8377f7dcb
|
讨论区模型
|
10 years ago |
|
lizanle
|
e5082ff489
|
新版课程动态 课程作业展示
|
10 years ago |
|
lizanle
|
d73a2c1003
|
课程动态新版api
|
10 years ago |
|
lizanle
|
7d76b20574
|
作业那块逻辑修改，对于作业的学生提问以及回复功能需要取消
|
10 years ago |
|
lizanle
|
849af9b04b
|
课程评论添加上拉分页
|
10 years ago |
|
lizanle
|
ad99cb8535
|
与我相关 查看相关的详细内容
|
10 years ago |
|
lizanle
|
3318d11c6d
|
个人留言
|
10 years ago |
|
lizanle
|
6353a2e2c8
|
留言分页
|
10 years ago |
|
lizanle
|
8e04b4e565
|
回复留言
|
10 years ago |
|
lizanle
|
dced5f328e
|
用户留言列表api
给用户留言 api
|
10 years ago |
|
lizanle
|
e1dd4823d5
|
课程通知发布api
|
10 years ago |
|
lizanle
|
3b137dadb8
|
查询未关注需要用户id
|
10 years ago |
|
lizanle
|
a262f86100
|
成绩查询我总是在最上方
|
10 years ago |
|
lizanle
|
75643b8181
|
修改一个查询user的bug
|
10 years ago |
|
lizanle
|
a047bd3d18
|
课程作业发布功能
设置教辅功能
学生列表及成绩查看功能
|
10 years ago |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
10 years ago |
|
lizanle
|
3da5fdfa0f
|
课程课件搜索 课程学生搜索
|
10 years ago |
|
lizanle
|
8929644ab1
|
课程学生model
|
10 years ago |
|
lizanle
|
c353398d65
|
课程学生列表功能
|
10 years ago |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
10 years ago |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
61a938ef39
|
添加真名
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
c42a63ea4e
|
添加判空
|
10 years ago |
|
lizanle
|
68a54b9368
|
app评论
|
10 years ago |
|
lizanle
|
fc66050413
|
注册失败，提示中英文混合
|
10 years ago |
|
lizanle
|
d0562f1ede
|
编辑课程的时候如果没有输密码，那就用原来的密码
|
10 years ago |
|
lizanle
|
a04122bb8e
|
提示改为中文 2903
|
10 years ago |
|
lizanle
|
d1b5d28ff0
|
2901 工作单位不显示
|
10 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
lizanle
|
f96fbe5150
|
注释一行不需要的
|
10 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
 z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
11 years ago |
|
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
11 years ago |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
11 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
11 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
11 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
11 years ago |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
11 years ago |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
11 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
11 years ago |
|
z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
11 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
11 years ago |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
11 years ago |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
11 years ago |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
11 years ago |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
11 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
11 years ago |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
11 years ago |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
11 years ago |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
11 years ago |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
11 years ago |
|
z9hang
|
103a411b40
|
修改用户搜索接口
|
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 |
|
z9hang
|
4fdc1b97a5
|
配置API comment接口，修正显示课程通知接口未判断权限问题
|
11 years ago |
|
z9hang
|
3cd97f8a70
|
API添加comment模块
|
11 years ago |
|
z9hang
|
6d79c2cf83
|
手机端ＡＰＩ添加新闻评论实体Comment，新闻实体中引用Comment,课程新闻列表添加权限判断，并修正该接口不可用问题
|
11 years ago |
|
z9hang
|
8216453a02
|
匿评作品详情返回结果中添加comment_status字段 0:所属作业尚未开启匿评，1：匿评中 2：匿评结束
|
11 years ago |
|
z9hang
|
9708c50899
|
添加作品评分接口
|
11 years ago |
|
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合
|
11 years ago |
|
z9hang
|
a6488da7fa
|
修改ＡＰＩ上线问题
|
11 years ago |
|
z9hang
|
f7dbb24d35
|
修改测试版上线问题
|
11 years ago |
|
z9hang
|
222e2cc135
|
修改ErrorHandler未能加载问题
|
11 years ago |
|
z9hang
|
f793cff398
|
改为开发模式下才调用api文档
|
11 years ago |
|
z9hang
|
b2396df68c
|
优化下代码
|
11 years ago |
|
z9hang
|
4a672416e3
|
匿评作品详情接口添加评论的回复输出
|
11 years ago |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
11 years ago |
|
z9hang
|
a4d7e5f932
|
匿评作品详情显示接口
|
11 years ago |
|
z9hang
|
b6207c0a47
|
关闭匿评
|
11 years ago |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
11 years ago |
|
z9hang
|
b13f2b2dc8
|
添加我的作品列表接口
|
11 years ago |
|
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
11 years ago |
|
z9hang
|
0a33a716de
|
添加课程作业列表API接口
修改作业详情列表API接口
添加课程通知列表API接口
|
11 years ago |
|
z9hang
|
f0cac221e9
|
修正作业详情接口
|
11 years ago |
|
hhuai
|
8ecdaf2fe8
|
merge
|
11 years ago |
|
hhuai
|
5c9f1a1e1b
|
merge
|
11 years ago |
|
guange
|
828f57249c
|
merger
|
11 years ago |
|
guange
|
da880dae00
|
作业展示
|
11 years ago |
|
z9hang
|
fd1dc80bf0
|
修改作业详情接口
|
11 years ago |
|
z9hang
|
fdb38c1b87
|
修复课程教师，课程学生接口
|
11 years ago |
|
z9hang
|
303752fc7e
|
修复退出课程接口
|
11 years ago |
|
z9hang
|
b711793d7c
|
修正加入课程接口问题
|
11 years ago |
|
z9hang
|
d407f8656d
|
1、修复课程img_url为空问题。2、补上用户课程接口
|
11 years ago |
|
z9hang
|
1686ed4fbd
|
补上显示用户接口
|
11 years ago |
|
z9hang
|
ed776fa9b9
|
1、修正用户编辑接口报错问题。2、修正用户注册，编辑用户接口返回数据不正确问题
|
11 years ago |
|
z9hang
|
2c49dad4dc
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
59f687bb6a
|
added homework
|
11 years ago |
|
z9hang
|
58c31b1d7f
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
f252438f85
|
修改编辑课程接口
|
11 years ago |
|
guange
|
b1125e7d7e
|
编辑课程改为put
|
11 years ago |
|
guange
|
a3ed599d49
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
b5da95d5ce
|
修改错误
|
11 years ago |
|
guange
|
d97b26f131
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
d7cad23854
|
加上作业
|
11 years ago |
|
hhuai
|
d1846e6303
|
for update
|
11 years ago |
|
z9hang
|
40d06011f8
|
修改用户的课程列表接口
|
11 years ago |
|
z9han
|
4518fe4355
|
test
|
11 years ago |
|
z9han
|
d7557e2839
|
修改密码返回错误问题
|
11 years ago |
|
z9han
|
93762e89d3
|
修改加入课程、退出课程接口调用，添加创建课程，编辑课程的参数说明
|
11 years ago |
|
guange
|
7f1826ebf2
|
修改个人信息
|
11 years ago |
|
guange
|
9d99eee92e
|
用户密码修改没传userid
|
11 years ago |
|
guange
|
d6aadc1624
|
搜索和列表中的课程老师输出一致
|
11 years ago |
|
guange
|
8fe5fee0f0
|
搜索课程报错
|
11 years ago |
|
guange
|
03f2c9c192
|
关注返回规范化
|
11 years ago |
|
guange
|
f9aa145c2b
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
4df9544770
|
关注列表返回优化
|
11 years ago |
|
z9han
|
7f9386180d
|
部分接口添加权限验证接口、新闻详情及对应评论接口
|
11 years ago |
|
guange
|
df18eac875
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
guange
|
6cb3f9e53c
|
注册用户时好多用户字段没有，默认为null
|
11 years ago |
|
z9hang
|
95d8c1a09d
|
修改课程成员列表接口，增加权限判断
|
11 years ago |
|
guange
|
efa08adf4e
|
认证用普通模式返回
|
11 years ago |
|
guange
|
ee988b6ec5
|
补全课程和用户接口
|
11 years ago |
|
z9hang
|
29069c58ae
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
11 years ago |
|
z9hang
|
2ab2abe9e5
|
课程搜索接口
|
11 years ago |
|
guange
|
236968d946
|
错误统一处理
|
11 years ago |
|
guange
|
40d0c03751
|
修改用户密码
|
11 years ago |
|
guange
|
6a3ebb5e94
|
关注接口完成
|
11 years ago |
|
guange
|
5eba06ddf9
|
加入api在线文档
|
11 years ago |
|
guange
|
70bc6acbd2
|
修改用户个人信息
|
11 years ago |
|
guange
|
c054852b4e
|
登录后返回用户资料
|
11 years ago |
|
guange
|
4a6c26d499
|
将entities重构
|
11 years ago |
|
guange
|
41d9af1ab9
|
auto reload api folder in development mode.
|
11 years ago |
|
guange
|
ee3d998873
|
课程列表接口加入老师字段
|
11 years ago |
|
guange
|
c7c25edf17
|
加上pry支持
|
11 years ago |
|
guange
|
db9eebbac7
|
[API]注册接口完成
|
11 years ago |
|
guange
|
4214f39bae
|
完善注册api
|
11 years ago |
|
guange
|
c303d2b4ca
|
将注册功能移动到UserService中
|
11 years ago |
www
|
53ecf8718f
|
[api]用户认证完成
|
11 years ago |
