 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接口部分信息国际化
|
10 years ago |
|
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
10 years ago |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
10 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
10 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
10 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
10 years ago |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
10 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
|
10 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
10 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
10 years ago |
|
z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
10 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
|
10 years ago |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
10 years ago |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
10 years ago |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
10 years ago |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
10 years ago |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
10 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
10 years ago |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
10 years ago |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
10 years ago |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
10 years ago |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
10 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 |
