 huang
|
654ebfca46
|
项目邀请添加：姓、名、性别
|
10 years ago |
|
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
10 years ago |
|
huang
|
5b0738a4cb
|
匿评启动失败邮件通知:实现程序及界面
|
10 years ago |
 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
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
 lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
huang
|
4c71e2c256
|
项目类型提示JS
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
10 years ago |
 sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
guange
|
186bf9070c
|
配置丢失
|
10 years ago |
|
huang
|
db1dfa34ac
|
恢复邮件配置文件
|
10 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
|
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
huang
|
295921c89d
|
邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
|
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
10 years ago |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
|
huang
|
cc3990de44
|
修改发系统消息后跳转路劲
|
10 years ago |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
10 years ago |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
cxt
|
d4dfd97b97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
10 years ago |
|
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
|
10 years ago |
|
sw
|
00a8dc94c3
|
缺陷的回复功能
|
10 years ago |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
cxt
|
1e320e63c6
|
底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复
|
10 years ago |
|
guange
|
8f426ca040
|
merge
|
10 years ago |
|
sw
|
a23ec96508
|
学校首页报404
|
10 years ago |
|
sw
|
51bf1cd678
|
作业搜索支持enter键
|
10 years ago |
|
guange
|
e8fe397158
|
added
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
lizanle
|
7f9289d6c3
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
18e2d05f41
|
重置邮件标题改变
|
10 years ago |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
10 years ago |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
guange
|
b9e08b22cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
631283ae79
|
remove grack
|
10 years ago |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
10 years ago |
|
lizanle
|
ccfd69602c
|
服务协议
|
10 years ago |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
10 years ago |
|
huang
|
bc563119d6
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
d132c08a11
|
增加footer
|
10 years ago |
|
huang
|
5306d7e2a4
|
列表排序（未完）
|
10 years ago |
|
huang
|
4fd90464d9
|
Merge branch 'sw_new_course' into dev_hjq
|
10 years ago |
|
huang
|
e129404b4c
|
解决图标点两次的问题
|
10 years ago |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
10 years ago |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
10 years ago |
|
guange
|
3a601bbd2c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
2a522f144e
|
编辑个人简介
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
705d31b1d0
|
资源库 修改
|
10 years ago |
|
lizanle
|
76c2c47adf
|
资源库
|
10 years ago |
|
lizanle
|
76be15f79b
|
资源库
|
10 years ago |
|
lizanle
|
25460cd255
|
资源库
|
10 years ago |
|
guange
|
d36da76685
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
huang
|
a38e91b3d3
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
cxt
|
58613e843b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
da20f6bc89
|
超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
sw
|
ac4d529ebc
|
编程作业取消，并设定匿评为内置功能
|
10 years ago |
|
huang
|
2c865069d3
|
所有消息显示功能
|
10 years ago |
|
huang
|
510613f9a4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
 ouyangxuhua
|
11ad8d6d42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
|
ouyangxuhua
|
a5f7f8e622
|
项目--版本：如图提示信息不合适问题修改
|
10 years ago |
|
cxt
|
a872692984
|
为activities表添加created_at字段，并导入数据
|
10 years ago |
|
lizanle
|
d0bca180ca
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
5d82f3336e
|
导入作者是我，但是问卷在其他课程里的问卷，可以多选
|
10 years ago |
|
huang
|
bc6b6b0536
|
底部国际化
|
10 years ago |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
10 years ago |
|
huang
|
15b3d527dc
|
footer
|
10 years ago |
|
sw
|
fe2d621dc3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/users_helper.rb
|
10 years ago |
|
sw
|
1cd50693b5
|
登录失败错误信息提示
|
10 years ago |
|
huang
|
a915a35819
|
优化版本代码加提示
|
10 years ago |
|
huang
|
c376c0e38f
|
新建版本 --新页面设计
|
10 years ago |
|
huang
|
e70748fd81
|
去掉项目辅助工具（dts、yun）
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
