 guange
|
b9156b271e
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-10 15:11:26 +08:00 |
|
guange
|
5eba06ddf9
|
加入api在线文档
|
2014-12-10 15:11:10 +08:00 |
 z9hang
|
41fa6f02f1
|
关注列表、关注与取消关注接口
|
2014-12-10 15:07:41 +08:00 |
|
z9hang
|
bd685e16ec
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-10 14:34:36 +08:00 |
|
z9hang
|
fbd38b4a53
|
关注列表与关注
|
2014-12-10 14:33:05 +08:00 |
|
guange
|
70bc6acbd2
|
修改用户个人信息
|
2014-12-10 11:56:33 +08:00 |
|
z9hang
|
7efd2375ff
|
个人信息修改接口
|
2014-12-10 11:21:23 +08:00 |
|
guange
|
c054852b4e
|
登录后返回用户资料
|
2014-12-09 16:57:08 +08:00 |
|
z9hang
|
dbb46b07a6
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
Conflicts:
Gemfile.lock
|
2014-12-09 16:43:06 +08:00 |
|
z9hang
|
890f49eb36
|
用户信息显示方法修改
|
2014-12-09 16:40:52 +08:00 |
|
guange
|
4a6c26d499
|
将entities重构
|
2014-12-09 16:36:43 +08:00 |
|
guange
|
41d9af1ab9
|
auto reload api folder in development mode.
|
2014-12-09 15:16:47 +08:00 |
|
guange
|
ee3d998873
|
课程列表接口加入老师字段
|
2014-12-08 16:51:21 +08:00 |
|
guange
|
3aea87b893
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-08 15:27:27 +08:00 |
|
guange
|
c7c25edf17
|
加上pry支持
|
2014-12-08 15:27:18 +08:00 |
|
z9hang
|
5676770100
|
添加课程列表接口
|
2014-12-08 15:19:10 +08:00 |
|
guange
|
db9eebbac7
|
[API]注册接口完成
|
2014-12-07 10:48:05 +08:00 |
|
guange
|
91ea1adad3
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2014-12-07 10:08:09 +08:00 |
|
z9hang
|
fa1e7c9a04
|
修正密码长度判断错误问题
|
2014-12-06 11:27:52 +08:00 |
|
guange
|
4be329db11
|
osx忽略.DS_Store
|
2014-12-04 17:15:17 +08:00 |
|
z9hang
|
2a7e0365b8
|
注册修改
|
2014-12-04 15:53:47 +08:00 |
|
guange
|
4214f39bae
|
完善注册api
|
2014-12-04 10:11:55 +08:00 |
|
guange
|
c303d2b4ca
|
将注册功能移动到UserService中
|
2014-12-03 17:29:03 +08:00 |
www
|
53ecf8718f
|
[api]用户认证完成
|
2014-11-27 19:43:04 +08:00 |
|
z9hang
|
b0db7dfece
|
添加判断课程是否为当前学期或下一学期方法
|
2014-11-26 17:38:46 +08:00 |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
2014-11-26 16:51:09 +08:00 |
|
z9hang
|
8a3669ba3b
|
引用次数统计包括多级引用
|
2014-11-26 15:26:57 +08:00 |
|
z9hang
|
ad2a4487c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-26 14:54:51 +08:00 |
|
z9hang
|
5a20945e0d
|
选入我得课程列表中添加课程学期的显示
|
2014-11-26 14:54:31 +08:00 |
 sw
|
c2ac26ed61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-25 16:53:16 +08:00 |
|
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
2014-11-25 16:51:22 +08:00 |
 alan
|
3eddca8c6e
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-25 16:09:38 +08:00 |
|
alan
|
1fb4b81051
|
修改bug<IE老版本tag显示异常>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-25 16:09:13 +08:00 |
|
sw
|
eb3ac06b40
|
Merge branch 'develop' into szzh
|
2014-11-25 16:03:18 +08:00 |
|
sw
|
bb66ef54f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-25 16:02:22 +08:00 |
|
sw
|
23907c5c01
|
修改课程讨论区按钮样式
|
2014-11-25 16:02:11 +08:00 |
|
z9hang
|
874936a131
|
恢复被还原的代码
|
2014-11-25 16:00:52 +08:00 |
|
sw
|
70f7c73699
|
Merge branch 'szzh' into develop
|
2014-11-25 14:24:51 +08:00 |
|
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
2014-11-25 14:22:46 +08:00 |
|
sw
|
918cf6c134
|
修改竞赛标签添加时按钮样式
|
2014-11-25 14:17:39 +08:00 |
|
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-25 14:17:27 +08:00 |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-25 14:17:04 +08:00 |
|
sw
|
a8cdd2b64c
|
修改新建缺陷时按钮的样式
|
2014-11-25 13:57:30 +08:00 |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
2014-11-25 11:29:09 +08:00 |
|
sw
|
89e5eda397
|
1.修改课程项目编辑讨论区帖子时按钮样式
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
|
2014-11-25 10:52:07 +08:00 |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
2014-11-25 10:35:43 +08:00 |
|
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
2014-11-25 10:15:34 +08:00 |
|
sw
|
23da0a6dad
|
修改作业提交项目时默认问空
|
2014-11-25 10:03:56 +08:00 |
|
sw
|
d19bf06da4
|
修改课程添加tagform表单内元素
|
2014-11-25 09:16:22 +08:00 |
|
sw
|
2c135f5e8d
|
修改课程添加标签返回404的BUG
|
2014-11-25 09:12:15 +08:00 |