 sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
 huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
2015-05-29 14:52:24 +08:00 |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
2015-05-29 14:36:44 +08:00 |
|
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
2015-05-28 15:45:36 +08:00 |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
2015-05-28 14:13:47 +08:00 |
|
sw
|
e1a3ed4b82
|
到处Excel
|
2015-05-28 11:07:28 +08:00 |
 guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
|
guange
|
b5d9cf55ff
|
将域名配置加入到管理员后台
|
2015-05-22 15:59:37 +08:00 |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-21 11:20:12 +08:00 |
|
sw
|
25672aa229
|
编辑作业功能完成
|
2015-05-20 17:01:08 +08:00 |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
2015-05-20 16:49:19 +08:00 |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
2015-05-20 16:24:32 +08:00 |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
2015-05-20 15:05:35 +08:00 |
|
guange
|
9b0602fd9c
|
新增学生作业下载spec
|
2015-05-18 17:26:50 +08:00 |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
2015-05-15 23:47:22 +08:00 |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
2015-05-15 17:35:24 +08:00 |
|
huang
|
6c500109c9
|
修改项目上传资源
|
2015-05-13 10:06:04 +08:00 |
|
sw
|
cfe3021391
|
用户收索国际化丢失
|
2015-05-08 09:16:11 +08:00 |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 09:31:22 +08:00 |
|
huang
|
f08357d300
|
用户反馈添加提示：课程问题反馈给老师
|
2015-05-07 09:17:47 +08:00 |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
2015-05-06 15:01:26 +08:00 |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
2015-05-06 14:20:55 +08:00 |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
2015-05-06 09:26:14 +08:00 |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
2015-05-05 16:29:53 +08:00 |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
2015-04-30 11:08:36 +08:00 |
whimlex
|
e30c446847
|
项目私有问题提示信息
|
2015-04-27 17:49:05 +08:00 |
|
whimlex
|
b61d76d94e
|
意见反馈
|
2015-04-23 18:18:07 +08:00 |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
2015-04-23 17:43:10 +08:00 |
|
whimlex
|
15d7cde055
|
意见反馈
|
2015-04-23 16:57:18 +08:00 |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-22 14:35:25 +08:00 |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
2015-04-22 14:35:04 +08:00 |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
2015-04-22 11:14:12 +08:00 |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
2015-04-22 11:11:51 +08:00 |
|
huang
|
49f33dd50c
|
类型bug修复
|
2015-04-22 10:50:12 +08:00 |
 lizanle
|
0de5ddd14c
|
题型用户上传百度云
|
2015-04-22 10:33:09 +08:00 |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
2015-04-22 10:24:15 +08:00 |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
2015-04-22 09:31:13 +08:00 |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
2015-04-21 16:17:51 +08:00 |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 15:11:15 +08:00 |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
2015-04-21 15:10:45 +08:00 |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
2015-04-21 14:19:50 +08:00 |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
2015-04-17 17:48:25 +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
|
54f8079ba6
|
去掉html符号
|
2015-04-17 14:34:57 +08:00 |
|
lizanle
|
3bba1f93b4
|
版本库名输入条件描述去掉换行符
|
2015-04-17 12:01:31 +08:00 |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-17 11:11:03 +08:00 |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
2015-04-17 10:36:32 +08:00 |
|
huang
|
d1e7777040
|
关注列表样式
|
2015-04-16 20:00:07 +08:00 |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
2015-04-16 19:08:16 +08:00 |