lizanle
|
9330418668
|
学校列表div 下拉分页
|
10 years ago |
huang
|
dc5721497e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
lizanle
|
1f1a8e0770
|
管理员修改学校的功能
|
10 years ago |
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容:把“你”统一改成“您”;发布作业是本人的话,改成“您发布了作业”,而非“某某老师发布了作业”等
|
10 years ago |
ouyangxuhua
|
4deeaa0f34
|
1.增加消息:用户迟交作业时,发送不能参与匿评的消息;
2.增加消息:用户创建课程时,发送创建课程消息。
|
10 years ago |
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
huang
|
64fa435a3a
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
huang
|
f189e3cde8
|
0
|
10 years ago |
guange
|
74fd461fac
|
.
|
10 years ago |
guange
|
acbd690bc6
|
添加转换页面
|
10 years ago |
huang
|
765d2b875d
|
还原目录显示
|
10 years ago |
huang
|
b1ba6d576a
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
lizanle
|
707244886c
|
学校列表分页
|
10 years ago |
ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示;
2.对于发布作业消息,当作业消息为空时,不显示;
3.消息列表中,“全部”改成“所有消息”
|
10 years ago |
ouyangxuhua
|
2f2ad38cdf
|
1.用户被拉入项目,发送相应消息给该用户;
2.用户被移出项目,发送消息给该用户。
|
10 years ago |
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
lizanle
|
bbd3999ab2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
e3a660cf18
|
添加学校
|
10 years ago |
cxt
|
0f0351b343
|
解决冲突
|
10 years ago |
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
10 years ago |
huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
10 years ago |
huang
|
d0ea49d1e9
|
解决项目讨论区置顶功能不能使用问题
|
10 years ago |
huang
|
9399063886
|
创建版本库控制层及国际化
|
10 years ago |
huang
|
61bcdd4643
|
只允许创建一个版本库
|
10 years ago |
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
10 years ago |
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
10 years ago |
guange
|
af03d6c00c
|
IE11乱码问题
|
10 years ago |
huang
|
9eb498dbc4
|
版本库 文件目录(未完成--)
|
10 years ago |
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
guange
|
5b2fb66468
|
解决ie11下载乱码问题
|
10 years ago |
cxt
|
53a7b1dda4
|
课程讨论区动态按最后更新时间排序
|
10 years ago |
huang
|
73898953d9
|
project表添加字段,记录project对应gitlba中project id
|
10 years ago |
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
10 years ago |
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标;
|
10 years ago |
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
huang
|
47de084a6c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
a0f0ecf86d
|
修改未读消息500问题
|
10 years ago |
huang
|
ebe1afd489
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
2518305959
|
项目删除跳转修改;项目删除提示修改
|
10 years ago |
ouyangxuhua
|
77581d46eb
|
1.将所有类型的消息都列出来;
2.修复当消息为空时,浏览器端报错的问题。
|
10 years ago |
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
10 years ago |
sw
|
7c825baf19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
ouyangxuhua
|
f4b92e110f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
sw
|
ff5e167e3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
829e94c563
|
enter可修改tag name并且只修改一次
|
10 years ago |
sw
|
e6bb599a6c
|
TAG批量修改完成
|
10 years ago |
ouyangxuhua
|
c4c005a39b
|
修改获取所有消息的排序算法,使用数据库的order
|
10 years ago |
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
7b18c14aa3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
654ebfca46
|
项目邀请添加:姓、名、性别
|
10 years ago |
ouyangxuhua
|
28bbbb1508
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
ouyangxuhua
|
8841b5221b
|
消息显示内容修改
|
10 years ago |
lizanle
|
b51066694e
|
全部 按钮
|
10 years ago |
huang
|
fce872a6a5
|
优化issue显示代码
|
10 years ago |
lizanle
|
b8be9c6425
|
批量修改tag
|
10 years ago |
huang
|
2aeebfe645
|
优化数组排序
有序排序
|
10 years ago |
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致,按照时间排序
待优化点:数组排序
|
10 years ago |
huang
|
6179e455d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
e054f8045c
|
去掉Git的中英文说明
新的提交代码指定入口
|
10 years ago |
lizanle
|
7cbee4cd53
|
编辑tag有时候不能用
|
10 years ago |
sw
|
11314a5366
|
第二个人打分之后,评分结果的样式
|
10 years ago |
sw
|
87e4bfdd3f
|
课程内导入作业却将作业发布到被导入的课程
|
10 years ago |
sw
|
a3ce43c3d5
|
去掉与我相关
|
10 years ago |
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
16333d69f7
|
文件列表
|
10 years ago |
cxt
|
7057247700
|
首页项目动态讨论区回复无法刷新
|
10 years ago |
huang
|
18d028bb7e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
0ecfb7b935
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
3d9dcfe250
|
作业的最后更新时间为作品的最新提交时间
|
10 years ago |
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
10 years ago |
sw
|
9a5dba7773
|
课程内发布、修改、删除作业后跳转仍在课程内的作业列表
|
10 years ago |
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
huang
|
0a1798eb0b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
ba569403c3
|
1、匿评关闭/开启发送对象为所有成员
2、匿评方法封装
3、匿评开启/关闭邮件通知发送对象为课程所有成员
|
10 years ago |
cxt
|
be932e3b1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
lizanle
|
39c5571d73
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
c3d829a68f
|
名称检查
|
10 years ago |
ouyangxuhua
|
31c5cf2163
|
1.将作品评论、回复作品评论等加入至作业消息列表
|
10 years ago |
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
sw
|
6c62b44b59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
lizanle
|
befd8d66f6
|
编辑名称检查
|
10 years ago |
sw
|
709e099770
|
增加部分作业关联表的判断
|
10 years ago |
huang
|
8886bda790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
44c097dbaf
|
1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
|
10 years ago |
lizanle
|
f99ccf724c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
c1bd17b07e
|
项目论坛发帖排序比较乱。 去掉置顶功能(发帖的功能里原来有置顶按钮。现在没有了。所以排序也要取消)
|
10 years ago |
huang
|
20465764a7
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
1e8cb91ab4
|
boards
|
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 |
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
10 years ago |
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
huang
|
38ba47f8c8
|
讨论区结构修改
任务中添加:自动开启/关闭匿评消息通知
匿评开启失败消息通知
|
10 years ago |
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
10 years ago |
lizanle
|
9f22eed093
|
帖子的名称也要修改
|
10 years ago |
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子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 |
lizanle
|
b9ff46f8d0
|
帖子的编辑与删除
|
10 years ago |
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
10 years ago |
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
lizanle
|
272d9fa527
|
论坛的标签可修改
|
10 years ago |
huang
|
8d64114c58
|
留言引用样式调整
|
10 years ago |
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话,所有的含有该tag的资源的那个标签页要重命名
|
10 years ago |
sw
|
9d2b58738e
|
分班过滤功能
|
10 years ago |
sw
|
90536efa1e
|
课程内姓名学号邮箱过滤,各种排序 改为js刷新页面
|
10 years ago |
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化(未完成)
|
10 years ago |
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间,并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
lizanle
|
553c1396dd
|
帖子创建不成功 给出原因
帖子发布时长度检查
|
10 years ago |
huang
|
d9620e416e
|
优化“全部设为已读” 代码
|
10 years ago |
huang
|
6e9db8b922
|
封装点击按钮时间
|
10 years ago |
huang
|
fb034090d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/users/user_messages.html.erb
解决冲突
|
10 years ago |
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
10 years ago |
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制,项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
10 years ago |
lizanle
|
11714868b7
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
sw
|
ccd19021ae
|
课程动态回复之后,编辑器变宽
|
10 years ago |
huang
|
42745092c5
|
设置权限,其他人不能访问我的消息列表
|
10 years ago |
lizanle
|
46c806900e
|
贴吧列表和主题列表 按不同的规则排序的时候,如果翻页了,又回到了综合排序的问题
|
10 years ago |
huang
|
c8f2430004
|
系统消息每页显示10个
|
10 years ago |
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
10 years ago |
lizanle
|
b621449406
|
帖子过滤错误
|
10 years ago |
lizanle
|
422e07fa48
|
帖子展示错误
|
10 years ago |
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题(通过随机6为密码)
|
10 years ago |
sw
|
05f7bf9634
|
test1
|
10 years ago |
huang
|
ff2e3e168d
|
开启/关闭匿评消息通知
|
10 years ago |
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
huang
|
ba2474e480
|
关闭匿评消息
|
10 years ago |
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
10 years ago |
huang
|
c3223982cd
|
修改系统消息链接跳转
|
10 years ago |
huang
|
81743143c2
|
优化用户留言页面
|
10 years ago |
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
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 |
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
sw
|
8eb2c75cbc
|
1、编程作业修改评分比例之后成绩计算问题
2、关闭匿评之后样式
|
10 years ago |
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
10 years ago |
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
10 years ago |
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
10 years ago |
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
10 years ago |
sw
|
b8cb422268
|
排序功能
|
10 years ago |
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
10 years ago |
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
10 years ago |
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
sw
|
53d6c6853d
|
作品列表的显示
|
10 years ago |
huang
|
b5f4b1dd96
|
功能:24小时内系统消息显示
|
10 years ago |
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
sw
|
efdd717c3c
|
成绩计算算法的实现
|
10 years ago |
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
10 years ago |
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
10 years ago |
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”,因为邀请用户中已经包含该功能
|
10 years ago |
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
sw
|
939a010adb
|
静态页面添加
|
10 years ago |
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
10 years ago |
huang
|
b43acd3a46
|
邀请用户加入项目:
特殊情况:用户登录名=邮箱名,用户修改邮箱,此时将用户作为条件邀请
|
10 years ago |
huang
|
78ca55f121
|
优化邮件邀请策略
|
10 years ago |
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时,迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
b0ccf9037a
|
邮件邀请:
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
sw
|
cd96fd99a8
|
快速创建项目
|
10 years ago |
huang
|
295921c89d
|
邮件:邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题
|
10 years ago |
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
10 years ago |
huang
|
4a7d3c9072
|
系统消息增加长度
|
10 years ago |
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
10 years ago |
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
10 years ago |
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
10 years ago |
sw
|
37f235c2ab
|
导入编程作业
|
10 years ago |
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
10 years ago |
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
10 years ago |
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
cxt
|
1855adb037
|
未登录用户不能访问新建课程页面
|
10 years ago |
sw
|
cd36965cd1
|
历史编程作业数据补齐
|
10 years ago |
sw
|
7db774eedb
|
新建作业时,匿评相关属性为作业必须属性
|
10 years ago |