 ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
2015-11-12 20:57:41 +08:00 |
|
ouyangxuhua
|
d508cfa381
|
组织模块功能实现
|
2015-11-12 14:55:31 +08:00 |
|
ouyangxuhua
|
a3443ba968
|
组织模块功能实现
|
2015-11-12 09:32:00 +08:00 |
 lizanle
|
d13205bd3d
|
文件正在上传提示
|
2015-11-11 11:39:02 +08:00 |
|
lizanle
|
20b49385de
|
更改时区设置
作业发布消息添加发布时间
|
2015-11-09 15:36:32 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
lizanle
|
59e95b08d7
|
feed_back
|
2015-11-05 13:49:27 +08:00 |
 cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-04 11:16:25 +08:00 |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
2015-11-04 10:54:09 +08:00 |
|
lizanle
|
8d25b5676c
|
tag_name名称长度扩大至120个字符
|
2015-11-03 14:56:32 +08:00 |
|
ouyangxuhua
|
eadab840b6
|
建立组织、成员表及模型控制器；
编写创建组织页面。
|
2015-11-03 11:19:38 +08:00 |
 huang
|
4d5d012ecf
|
版本库相关界面调整
|
2015-11-02 16:41:15 +08:00 |
|
cxt
|
6e7a6909d6
|
作业动态中的未发布作业显示发布时间
|
2015-11-02 10:02:02 +08:00 |
|
lizanle
|
b7a6bc3614
|
outline url
|
2015-10-30 17:21:12 +08:00 |
|
huang
|
89507b2b47
|
版本库域名写入配置文件中
|
2015-10-30 16:26:51 +08:00 |
|
huang
|
aa4710d872
|
git中忽略配置文件
提交记录新界面
修改获取用户路径
|
2015-10-30 15:46:06 +08:00 |
|
huang
|
470fb3bfa6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-29 17:29:26 +08:00 |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
2015-10-29 17:09:03 +08:00 |
|
huang
|
df8d2f8dd4
|
gitlab调用commits接口
|
2015-10-29 14:20:23 +08:00 |
|
lizanle
|
ac82910aa5
|
大纲
|
2015-10-29 11:53:52 +08:00 |
|
lizanle
|
b67afc2b95
|
大纲
|
2015-10-29 09:07:26 +08:00 |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
2015-10-28 15:54:27 +08:00 |
|
huang
|
294a517251
|
查看所有提交记录入口
点击自动复制版本库地址
|
2015-10-27 15:27:12 +08:00 |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
|
lizanle
|
07a2263b16
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
public/stylesheets/new_user.css
|
2015-10-27 14:08:08 +08:00 |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
2015-10-26 17:24:32 +08:00 |
|
lizanle
|
eaf4ad354f
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/courses_controller.rb
app/services/courses_service.rb
app/views/courses/join.js.erb
public/stylesheets/new_user.css
|
2015-10-26 10:21:13 +08:00 |
|
lizanle
|
9d89da7e66
|
课程加入消息错误
|
2015-10-24 11:11:49 +08:00 |
|
huang
|
7ab6c45262
|
1、转换界面添加提示。
2、url样式
|
2015-10-23 15:37:58 +08:00 |
|
cxt
|
fde4ce74ba
|
作业配置菜单增加评分设置
|
2015-10-23 14:45:56 +08:00 |
|
huang
|
03c2948a7c
|
查看内容对比
|
2015-10-22 16:53:36 +08:00 |
|
huang
|
bd793a00fe
|
贡献者页面
|
2015-10-22 16:16:23 +08:00 |
|
lizanle
|
35719f9c28
|
消息处理路由
|
2015-10-22 15:41:20 +08:00 |
|
huang
|
1157dcaa06
|
版本库summary
文件目录
新版本库地址
按分支显示提交记录
相关界面
|
2015-10-22 13:44:35 +08:00 |
|
cxt
|
7e21c00aed
|
添加作业的回复功能
|
2015-10-22 09:20:19 +08:00 |
|
lizanle
|
e44d95cca5
|
添加申请课程的加入身份
|
2015-10-21 14:52:00 +08:00 |
 guange
|
acbd690bc6
|
添加转换页面
|
2015-10-18 21:04:04 +08:00 |
|
guange
|
f1af041f24
|
gitlab key 更改
|
2015-10-18 13:56:10 +08:00 |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
|
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-15 17:06:53 +08:00 |
|
lizanle
|
e3a660cf18
|
添加学校
|
2015-10-15 17:06:42 +08:00 |
|
huang
|
778ff80b55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 17:02:40 +08:00 |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
2015-10-15 17:02:16 +08:00 |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
|
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 15:47:59 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
huang
|
9399063886
|
创建版本库控制层及国际化
|
2015-10-15 09:18:56 +08:00 |
|
huang
|
61bcdd4643
|
只允许创建一个版本库
|
2015-10-14 17:37:22 +08:00 |
|
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
2015-10-14 09:06:11 +08:00 |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
2015-10-12 15:51:47 +08:00 |
|
huang
|
fbeb6585d2
|
去掉初始化输出提示
|
2015-10-10 16:18:05 +08:00 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
|
huang
|
530d101024
|
项目邀请--姓名、长度JS验证
|
2015-10-09 11:25:21 +08:00 |
|
huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
2015-10-09 10:33:10 +08:00 |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
2015-10-08 14:23:32 +08:00 |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
2015-09-29 09:45:41 +08:00 |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
huang
|
4c71e2c256
|
项目类型提示JS
|
2015-09-24 11:44:02 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
2015-09-23 17:36:36 +08:00 |
 sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
guange
|
186bf9070c
|
配置丢失
|
2015-09-19 15:21:51 +08:00 |
|
huang
|
db1dfa34ac
|
恢复邮件配置文件
|
2015-09-19 11:00:00 +08:00 |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
2015-09-19 00:03:45 +08:00 |
|
lizanle
|
9443c139f0
|
update forum
|
2015-09-18 17:44:16 +08:00 |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
2015-09-18 10:05:26 +08:00 |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
2015-09-17 16:53:38 +08:00 |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
2015-09-17 15:24:12 +08:00 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
2015-09-16 10:49:34 +08:00 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
2015-09-15 10:50:58 +08:00 |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
2015-09-11 15:39:46 +08:00 |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
2015-09-11 09:45:28 +08:00 |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:37:53 +08:00 |
|
cxt
|
21565b74fe
|
冲突
|
2015-09-01 16:37:43 +08:00 |
|
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 15:45:49 +08:00 |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
|
sw
|
5f42ce4c80
|
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
|
2015-09-01 15:28:03 +08:00 |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
2015-09-01 15:17:40 +08:00 |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 11:29:53 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
cxt
|
1e320e63c6
|
底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复
|
2015-09-01 10:20:12 +08:00 |
|
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
sw
|
a23ec96508
|
学校首页报404
|
2015-08-29 10:07:36 +08:00 |