 huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:25:43 +08:00 |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
 Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
2015-09-16 16:13:40 +08:00 |
 sw
|
939a010adb
|
静态页面添加
|
2015-09-16 15:51:35 +08:00 |
 cxt
|
3bdab22aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 15:40:24 +08:00 |
|
cxt
|
a184ab4b69
|
个人动态首页只显示第一个动态的回复框，其它的需点击才显示
|
2015-09-16 15:40:05 +08:00 |
|
sw
|
fa00285529
|
css文件更新
|
2015-09-16 15:30:08 +08:00 |
 ouyangxuhua
|
e2024716e9
|
显示问题差别的html样式
|
2015-09-16 15:15:12 +08:00 |
|
sw
|
c21cea85f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 14:29:17 +08:00 |
|
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 12:40:12 +08:00 |
|
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
2015-09-16 12:39:08 +08:00 |
|
ouyangxuhua
|
99b300b225
|
问题对比显示
|
2015-09-16 12:38:50 +08:00 |
|
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
2015-09-16 12:38:01 +08:00 |
|
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
2015-09-16 11:28:35 +08:00 |
|
huang
|
b43acd3a46
|
邀请用户加入项目：
特殊情况：用户登录名=邮箱名，用户修改邮箱，此时将用户作为条件邀请
|
2015-09-16 11:09:10 +08:00 |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
2015-09-16 10:49:34 +08:00 |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
2015-09-16 10:26:13 +08:00 |
|
Tim
|
77a8c18a77
|
1.关于我们样式修改；
2.登录界面格式调整；
3.个人动态回复样式调整；
|
2015-09-16 10:16:25 +08:00 |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 09:51:59 +08:00 |
|
ouyangxuhua
|
3edeb81ba5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 09:50:06 +08:00 |
|
cxt
|
fddf466ce1
|
将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击
|
2015-09-16 09:45:27 +08:00 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
|
sw
|
9ee82c57be
|
去掉课程模块的导航栏
|
2015-09-15 17:01:39 +08:00 |
|
ouyangxuhua
|
3bd62310ad
|
增加word-wrap及word-break
|
2015-09-15 16:45:11 +08:00 |
|
cxt
|
0a2bfa1bdb
|
个人主页动态的缺陷回复与缺陷页面的回复内容不一致
|
2015-09-15 16:27:53 +08:00 |
|
sw
|
cd96fd99a8
|
快速创建项目
|
2015-09-15 16:11:55 +08:00 |
|
cxt
|
5ccace15da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-15 15:45:29 +08:00 |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
2015-09-15 15:45:16 +08:00 |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
2015-09-15 15:18:33 +08:00 |
|
sw
|
fff9c44271
|
学生没有课程和项目时，课程和项目导航有2条线
|
2015-09-15 15:16:49 +08:00 |
 lizanle
|
2fa01f32fb
|
schema
|
2015-09-15 11:28:08 +08:00 |
|
huang
|
9189ddd63b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-15 10:51:40 +08:00 |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
2015-09-15 10:50:58 +08:00 |
|
lizanle
|
1b9bde2284
|
课程资源的标签库可点击更改
|
2015-09-15 10:33:05 +08:00 |
|
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-15 10:32:11 +08:00 |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
|
cxt
|
e10e5e8412
|
调整课程通知页面的回复头像样式
|
2015-09-15 09:50:57 +08:00 |
|
sw
|
6127e0cee0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-15 09:36:38 +08:00 |
|
cxt
|
a999897efa
|
动态回复头像的调整
|
2015-09-15 09:22:18 +08:00 |
|
cxt
|
d0c19124b7
|
将课程的“私有”标志改成不可点击
|
2015-09-14 17:29:00 +08:00 |
|
ouyangxuhua
|
9ba89b3fe7
|
系统消息样式
|
2015-09-14 16:48:39 +08:00 |
|
ouyangxuhua
|
9ba0d3293e
|
修改系统消息提示样式
|
2015-09-14 16:05:29 +08:00 |
|
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
|
sw
|
e7f55148ca
|
Merge branch 'develop' into szzh
|
2015-09-11 18:37:56 +08:00 |
|
sw
|
2ce29b7dcc
|
删除应该忽略的文件
|
2015-09-11 18:36:56 +08:00 |
|
sw
|
9ce6bc225b
|
Merge branch 'szzh' into develop
|
2015-09-11 18:12:44 +08:00 |
|
sw
|
4a9fd15bfd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 18:12:02 +08:00 |
|
sw
|
8f3889e2c5
|
编程作品提交框自动增高
|
2015-09-11 18:03:37 +08:00 |
|
cxt
|
b3c73811fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 17:57:47 +08:00 |
|
cxt
|
f1a6e3d7e3
|
“关于我们”的样式调整
|
2015-09-11 17:57:25 +08:00 |