huang
|
9e0a986fe9
|
项目、课程讨论区邮件提醒查询修改
|
10 years ago |
huang
|
0354e65497
|
修改issues邮件通知查询语句
|
10 years ago |
guange
|
87e7db1a4b
|
添加附件时转换office文档
|
10 years ago |
sw
|
e6af34e9f8
|
学生列表显示
|
10 years ago |
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
sw
|
bd6a057008
|
老师布置作业加入个人动态
|
10 years ago |
sw
|
79f4e286cf
|
老师删除作业保报错
|
10 years ago |
sw
|
66c02f0667
|
1、新编辑器增加HomeworkCommon的Type
2、老师创建作业加入老师个人动态
|
10 years ago |
huang
|
64e56eca8e
|
邮件提醒,修改项目论坛提醒不全
|
10 years ago |
huang
|
6cddb59a4a
|
修改邮件提醒:项目缺陷动态不能收到
|
10 years ago |
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
10 years ago |
huang
|
7197c33be4
|
注释掉暂时未完成的功能
|
10 years ago |
huang
|
697f891546
|
私有项目邮件邀请权限认证
|
10 years ago |
huang
|
ee7c1eff32
|
修改已注册用户邮件邀请异常
|
10 years ago |
huang
|
d9ae9c8061
|
修改邮件通知提醒(邀请:未激活
点击链接:激活并加入项目)
|
10 years ago |
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
10 years ago |
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
10 years ago |
sw
|
a0324f5e39
|
增加评分回复,以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
10 years ago |
huang
|
67061d0ee5
|
允许新建重名项目
|
10 years ago |
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
10 years ago |
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
10 years ago |
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面,部分界面显示的初始化
4、提交新建作业按钮
|
10 years ago |
sw
|
a7fd5b950d
|
1、老师新建作业界面,数据i初始化
2、部分help方法添加
|
10 years ago |
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
sw
|
dc1971f507
|
学生作品详细得分表,以及相关的关系
|
10 years ago |
sw
|
08b469fa3c
|
学生作品匿评分配表
|
10 years ago |
sw
|
3abfaed081
|
学生提交作品表,以及相关的关系
|
10 years ago |
sw
|
bb3e0c4c7e
|
手动评分作业、编程作业相关表的添加以及关系的定义
|
10 years ago |
sw
|
7bfd7755f7
|
增加手动评分相关表,以及关系的定义
|
10 years ago |
sw
|
a43a6289e4
|
新的老师布置的作业表添加,以及相关关系定义
|
10 years ago |
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
10 years ago |
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
guange
|
86af233042
|
修正autologin多终端登录问题
|
10 years ago |
huang
|
888cd508c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
10 years ago |
sw
|
74a85e1601
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
10 years ago |
guange
|
49389ebe28
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
guange
|
dbccf9034d
|
邮件加入日志
|
10 years ago |
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能:在点击提交时代码后自动创建用户
用户自动登录功能
|
10 years ago |
guange
|
8384eff7f2
|
delayed_job条件错误
|
10 years ago |
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传,可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
10 years ago |
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
sw
|
0970182cd5
|
当教师只评分不评论时,学生可以进行回复
修改作业评论回复框样式不正确,修改项目用户反馈框显示不正确
|
10 years ago |
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
10 years ago |
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
10 years ago |
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
10 years ago |
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀(未完成,需切换分支)
|
10 years ago |
whimlex
|
6195f0a150
|
课程动态添加问卷发布,为通过问卷动态访问课程问卷做权限判断
|
10 years ago |
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
huang
|
4acad8088e
|
缺陷最新显示最上面
代码优化
|
10 years ago |
sw
|
81cbb76d78
|
课程/项目--添加成员:用真实姓名搜索用户时,需要在姓和名之间加个空格才可以搜到
|
10 years ago |
whimlex
|
cf4451e998
|
pre标签换行;contest主页样式调整
|
10 years ago |
whimlex
|
ccff6c27b0
|
#2170项目--新闻:评论新闻返回异常undefined method `split' for nil:NilClass
|
10 years ago |
guange
|
123fa079b3
|
smtp配置放入production
|
10 years ago |
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
guange
|
5a876d9df1
|
邮件发送时,单个收件人会报错
|
10 years ago |
whimlex
|
e030c12be8
|
课程动态计数和显示统一;问卷计数对学生和老师和显示统一;课程资源库排序
|
10 years ago |
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
lizanle
|
452e299966
|
删除demo代码
|
10 years ago |
guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
10 years ago |
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
10 years ago |
guange
|
9cefb9f339
|
每日发送取日期不对
|
10 years ago |
guange
|
0099ab9f9a
|
去除以前的邮件规则
|
10 years ago |
guange
|
243bac8fed
|
除了mail_notification == all 的,其他都不即时发邮件
|
10 years ago |
guange
|
3ea33aa847
|
新建news报500
|
10 years ago |
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里,很难注意到
|
10 years ago |
guange
|
27e123f9fd
|
const_defined?小错误
|
10 years ago |
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
10 years ago |
guange
|
efdfa67c64
|
日报homework created_on to created_at
|
10 years ago |
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统,改为可以每日一报、一事一报、不报
|
10 years ago |
lizanle
|
b95f479c17
|
级联删除资源
|
10 years ago |
lizanle
|
a4f1b9c625
|
model中会有许多kindeditor的资源
|
10 years ago |
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒(样式需要再调试)
|
10 years ago |
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
10 years ago |
whimlex
|
b95852dfcd
|
附件上传国际化:修改页面一些bug:用户主页个人得分身份信息修改
|
10 years ago |
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
10 years ago |
lizanle
|
da69443913
|
需要插入资源上传的时候插入数据库记录
|
10 years ago |
lizanle
|
39cbeced87
|
model类
|
10 years ago |
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
lizanle
|
4817b3106e
|
kindeditor资源类
|
10 years ago |
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
10 years ago |
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
10 years ago |
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
z9hang
|
43e9a9a495
|
1、完成手机app版本管理,上传客户端功能。2、手机app检查更新接口完成
|
10 years ago |
lizanle
|
87394fe4ce
|
issue2626,建议什么时候创建工程的信息也要加进来。
|
10 years ago |
guange
|
31351bc9e8
|
#1095 在issue主题下,输1个字符可以进行搜索,500错误解决
|
10 years ago |
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
10 years ago |
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
10 years ago |
whimlex
|
115eb38a02
|
完善用户资料模块,用户主页课程栏、留言栏、项目栏和标签模块国际化;对一些存储在数据表中的固定的中文属性,比如学期,职称,在helper和model中定义方法封装;平台导航模块,包括各模块内部导航的国际化;课程平台模块国际化整理和修改,去除重复功能标签
|
10 years ago |