 lizanle
|
09b6f1d787
|
修改news api
|
2015-06-26 17:16:03 +08:00 |
|
lizanle
|
a8377f7dcb
|
讨论区模型
|
2015-06-26 09:19:23 +08:00 |
|
lizanle
|
e5082ff489
|
新版课程动态 课程作业展示
|
2015-06-26 09:18:12 +08:00 |
|
lizanle
|
d73a2c1003
|
课程动态新版api
|
2015-06-19 15:05:25 +08:00 |
|
lizanle
|
7d76b20574
|
作业那块逻辑修改，对于作业的学生提问以及回复功能需要取消
|
2015-06-08 17:16:34 +08:00 |
|
lizanle
|
849af9b04b
|
课程评论添加上拉分页
|
2015-05-29 14:22:43 +08:00 |
|
lizanle
|
ad99cb8535
|
与我相关 查看相关的详细内容
|
2015-05-28 17:51:50 +08:00 |
|
lizanle
|
3318d11c6d
|
个人留言
|
2015-05-26 09:48:22 +08:00 |
|
lizanle
|
6353a2e2c8
|
留言分页
|
2015-05-23 17:13:38 +08:00 |
|
lizanle
|
8e04b4e565
|
回复留言
|
2015-05-21 15:57:35 +08:00 |
|
lizanle
|
dced5f328e
|
用户留言列表api
给用户留言 api
|
2015-05-20 17:27:17 +08:00 |
|
lizanle
|
e1dd4823d5
|
课程通知发布api
|
2015-05-15 16:13:32 +08:00 |
|
lizanle
|
3b137dadb8
|
查询未关注需要用户id
|
2015-05-15 14:04:05 +08:00 |
|
lizanle
|
a262f86100
|
成绩查询我总是在最上方
|
2015-05-15 14:02:41 +08:00 |
|
lizanle
|
75643b8181
|
修改一个查询user的bug
|
2015-05-15 10:17:47 +08:00 |
|
lizanle
|
a047bd3d18
|
课程作业发布功能
设置教辅功能
学生列表及成绩查看功能
|
2015-05-15 09:06:36 +08:00 |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
2015-05-13 09:56:34 +08:00 |
|
lizanle
|
3da5fdfa0f
|
课程课件搜索 课程学生搜索
|
2015-05-05 17:19:31 +08:00 |
|
lizanle
|
8929644ab1
|
课程学生model
|
2015-05-04 17:38:38 +08:00 |
|
lizanle
|
c353398d65
|
课程学生列表功能
|
2015-05-04 17:36:48 +08:00 |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
2015-04-29 17:46:39 +08:00 |
 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
|
2015-04-17 15:07:01 +08:00 |
|
lizanle
|
61a938ef39
|
添加真名
|
2015-04-16 15:48:53 +08:00 |
|
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
|
2015-04-16 10:26:03 +08:00 |
|
lizanle
|
c42a63ea4e
|
添加判空
|
2015-04-15 10:52:10 +08:00 |
|
lizanle
|
68a54b9368
|
app评论
|
2015-04-11 15:52:48 +08:00 |
|
lizanle
|
fc66050413
|
注册失败，提示中英文混合
|
2015-04-10 14:33:03 +08:00 |
|
lizanle
|
d0562f1ede
|
编辑课程的时候如果没有输密码，那就用原来的密码
|
2015-04-09 16:05:51 +08:00 |
|
lizanle
|
a04122bb8e
|
提示改为中文 2903
|
2015-04-08 18:22:53 +08:00 |
|
lizanle
|
d1b5d28ff0
|
2901 工作单位不显示
|
2015-04-08 18:22:16 +08:00 |
|
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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
|
lizanle
|
f96fbe5150
|
注释一行不需要的
|
2015-04-03 14:35:50 +08:00 |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
 z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
|
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
2015-03-18 17:31:35 +08:00 |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
2015-03-18 17:21:19 +08:00 |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
2015-03-13 17:10:22 +08:00 |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
2015-03-12 16:33:31 +08:00 |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
2015-03-10 17:20:30 +08:00 |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
2015-03-09 15:27:01 +08:00 |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
2015-03-09 15:26:02 +08:00 |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
2015-03-09 15:23:24 +08:00 |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
2015-03-07 16:19:55 +08:00 |
|
z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
2015-03-06 15:37:24 +08:00 |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
2015-03-05 10:09:19 +08:00 |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
2015-03-04 17:14:09 +08:00 |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
2015-03-04 17:04:07 +08:00 |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
2015-03-03 17:36:05 +08:00 |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
2015-03-03 09:11:47 +08:00 |