Commit Graph

830 Commits (2f8c8ea6ca8648c7c59b54da1b66b88b78b6eccd)

Author SHA1 Message Date
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
11 years ago
alan 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
11 years ago
alan 6e72e07028 Merge branch 'szzh' into email_verify
11 years ago
alan 6f9e2bad63 mail weekly
11 years ago
z9hang ef203ff40c 修正作业留言接口
11 years ago
alan 44c783a61b 帖子的邮件通知改成只有版主收到
11 years ago
alan 858b5ea97c 修改《讨论吧发帖发送邮件错误问题》
11 years ago
lizanle fa8475387a Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 8f5e613477 添加一些对代码理解的注释
11 years ago
alan 9681e08600 Merge branch 'szzh' into email_verify
11 years ago
alan 48cb0e0450 email verify
11 years ago
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug
11 years ago
alan a467736a5e 修改《多字段唯一性判断》
11 years ago
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 36c07f9664 修改拒绝项目成员加入后,页面不会刷新的BUG
11 years ago
huang d0a675f2b8 企业版模块
11 years ago
sw ce526fde77 Merge branch 'dev_zanle' into szzh
11 years ago
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
z9hang db1cd8851c Merge branch 'szzh' into api
11 years ago
alan 61634585f5 修改《news,forum模块发送邮件的模板》
11 years ago
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle
11 years ago
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan b20204fedd 修改《邮件重发一样引发的bug》
11 years ago
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
11 years ago
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle
11 years ago
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com>
11 years ago
lizanle 03ae5fdeac 添加注释
11 years ago
alan 8f1249390a 修改《发送多封相同邮件》
11 years ago
alan 432e3a05f2 增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
11 years ago
alan f01d164295 Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 6ccb154cc3 课程留言,发邮件给课程所有人
11 years ago
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能
11 years ago
alan 3315116832 修改《课程--留言:给课程留言却返回404》bug
11 years ago
lizanle 2431fea63e 日志查看Helper
11 years ago
alan 092265d53c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
sw 1e8c6374d7 Merge branch 'szzh' into Poll
11 years ago
alan ade0720331 邮件系统界面重置
11 years ago
alan b9ea3e589e 修改《邮件系统》页面
11 years ago
alan 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
alan 479a1249ae Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
11 years ago
lizanle 75ba61ed74 issue 1798 ,用户名出现不显示的情况
11 years ago
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh
11 years ago
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》
11 years ago
z9hang b6826a74d3 问卷显示
11 years ago
alan 2f147dcddd 增加《邮件地址自动登录功能》
11 years ago
z9hang 0f9915fc2a Merge branch 'szzh' into api
11 years ago
alan d96843a1d5 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 576f799105 Signed-off-by: alan <547533434@qq.com>
11 years ago
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire!
11 years ago
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构
11 years ago
alan 2262997c31 修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
11 years ago
sw 4c6ade4c08 定义各model之间的关系
11 years ago
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹
11 years ago
lizanle 10cde37582 cache using version
11 years ago
z9hang f55d8fe303 1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题
11 years ago
alan ba524675e0 修改<打分更新表单>bug
11 years ago
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3f6b36096c 缺陷查询添加integer_done类型处理(暂未用上)
11 years ago
sw 259799eb89 1.增加评分的model
11 years ago
alan 0e7f7a4254 优化《作业评分》
11 years ago
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw b512bc53e9 修改用户搜索无法精确搜索的bUG
11 years ago
alan 2a94c61a3e 修改bug(项目--缺陷:更新图片时在历史记录中没有相关记录,删除图片只显示一个更新时间也不合理)
11 years ago
alan 683acfcafc 优化《学生列表作业评分查询太慢》功能
11 years ago
sw b6327460a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能
11 years ago
= bb23468c7d Merge branch 'szzh' into api
11 years ago
sw 9280da5b61 取消描述是否为空的验证
11 years ago
alan 66d76eeed7 增加《不区分大小写分班班名唯一》功能
11 years ago
alan fbe6ce16d7 修改《分组界面》样式
11 years ago
alan 9d0e39e708 修改孙涛提出的bug
11 years ago
alan c9b84d0a35 增加《学生加入,退出分组》功能
11 years ago
alan 66f93150f6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
11 years ago
alan 9765f11f7e 增加<修改,添加分组>功能
11 years ago
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
11 years ago
z9hang ec21a98e64 修改密码验证的方法
11 years ago
z9hang d8e9dba404 #1647 正式版--资源搜索窗口搜索课程资源进行下载返回500错误(资源可见性判断修复)
11 years ago
alan 63c9804da8 添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
11 years ago
www 53ecf8718f [api]用户认证完成
11 years ago
alan ace5b514c6 修改bug<测试版--注册登录:成功激活注册的用户后,登录返回资料修改的页面,姓氏、名字还是标识为必填项>
11 years ago
alan 584944059a huanyuan
11 years ago
alan 6356596f08 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 88ab53730b 修改bug《登录密码错误报错》
11 years ago
z9hang e2892453de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 36e7b222bb 课程资源修改为公开的也需登录才能下载
11 years ago
alan 0049f921b9 修改bug《测试版--课程/项目--配置--成员添加:如图,用户列表中各用户的邮箱全部为空了》
11 years ago
alan 70e8c4ebe7 修改bug<注册后,用户第一次登陆都得转到《修改资料》页面>
11 years ago
sw dc480ecd44 调整页面代码,修复公共贴吧引用显示不正确的BUG
11 years ago
sw aef1cb31fa 1.设置帖子创建者可修改、删除帖子
11 years ago
alan e86ef8e6f0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan b7a89d6108 Merge branch 'shaproup' into szzh
11 years ago
z9hang 43931e921a 合作单位修改时错误提示信息为英文问题
11 years ago
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 0aae731eef 修改bug<点击排序后内容类型自动变为全部,但又并未显示全部资源>
11 years ago
alan 1d76d559dd 添加功能<用户搜索的问题>
11 years ago
alan 495c4db43e 增加功能<增加学生列表是否公开功能>
11 years ago
alan 8cec84dca7 添加<公共贴吧 无帖子置顶功能 建议增加>,<管理员可以根据贴吧的热度选择将贴吧置顶>
11 years ago
z9hang 8bfcbcc602 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
z9hang cb87d6337c 留言修改
11 years ago
gonglexin e8e7708d6e 作业匿评功能
11 years ago
alan fecf9513b9 修改bug《课程讨论区老师不能给帖子置顶》
11 years ago
z9hang 5cbbb98536 Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
11 years ago
z9hang 79b7373446 留言修改
11 years ago
sw c045b4682a 增加匿评分配作业表,以及和作业、作品、用户表关系键确认
11 years ago
alan b7cac9427b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 7d3a18197b 修改bug<注册时用户可以不填真实姓名,将其设置为可选>和《测试版:项目--点击作品下载报500错误》
11 years ago
sw 7e8ab97713 作业描述最大长度限制为3000个字符
11 years ago
sw 4e7965d060 优化页面代码
11 years ago
alan e044f5b615 修改contest中出现的逻辑错误
11 years ago
z9hang e4ff85894d 1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
11 years ago
sw 208940dd86 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang fadddcc09a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 76bab839c7 1、根据代码评审修改代码。2、修正部分页面标题。
11 years ago
sw 23ad3f26e4 修复bid模型中budget的format报错的BUG
11 years ago
sw 4082dbed5b 修改了部分model的validate(custon_field.rb之上)
11 years ago
z9hang f957666b25 部分网页标题不标准问题,补交之前漏掉未添加的文件
11 years ago
z9hang ef3e0798cc 1、课程、项目讨论区编辑附件没有公开字样问题。2、设置附件私有属性遗漏讨论区的附件的情况添加。3、编辑附件的描述、公开属性无效的问题,原因编辑保存逻辑存在问题,修正
11 years ago
z9hang 48164d8b94 竞赛中查看文本类附件报403问题
11 years ago
linhk 3ef05e64b8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
linhk 879e93beb9 项目、竞赛、课程首页的微信部分样式修改并添加js跟随滚动处理
11 years ago
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6180943f72 空数据库时创建项目报错问题,原redmine的项目按字母排序功能导致,现在项目没有按字母排序,故将之注释掉
11 years ago
alan 70b079041c 修改contests_controller.rb,contest.rb, contest_project.rb,contests_helper.rb,
11 years ago
linhk 20b8bf00b6 修改部分项目关注不能及时更新Bug
11 years ago
z9hang e8cde5f1cd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 4711e638eb 复制有附件的缺陷报错问题(屏蔽掉复制附件的功能)
11 years ago
nwb 51b21000a7 版本库标识限定为全局唯一
11 years ago
z9hang 42285ce44d 积分少于2分时不能踩人
11 years ago
z9hang cb8b0e0f41 admin页面中问题追踪项相关错误(课程、项目分离此处代码未改导致的问题)、项目列表中项目提交次数改为从数据库中读取(运行bundle exec rake project_score:calculate统计项目提交次数)
11 years ago
z9hang 74ba4384b1 1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改(原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset,修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象,注意:尚需测试)
11 years ago
z9hang d16b54a1ea 域名跳转问题、提交代码后版本库不能访问问题
11 years ago
ShengYue.Xu 047f6d2c95 修改了缺陷当中 #868、#780、#603
11 years ago
z9hang 9d23e6a8be 添加竞赛通知标题长度限制
11 years ago
sw 16d86a1fbd 课程、项目模块增加分页功能
11 years ago
chenmin 80bd535b4f 课程讨论区回复帖子的内容增加删除附件功能;
11 years ago
z9hang 9039755fc5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang ed3e9e3a03 项目成员列表积分计算的初步优化(降低访问速度)
11 years ago
zhanghaitao 13717dc3a3 缺陷界面选项功能的屏蔽;私有缺陷的显示条件修改
11 years ago
sw 445d29d036 1.修改新建帖子的长度上限设置,设置为2G
11 years ago
sw f99543ab4b #1294
11 years ago
zhanghaitao 88aa66b15b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhanghaitao 4934c8c801 # 页面返回异常处理
11 years ago
z9hang 56aa2fb8dc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang caed78327a 积分计算修改
11 years ago
sw 339a06007c 增加课程资源分离出来相关表
11 years ago
linhk cb4869fd20 解决新建版本库名长255个字符时异常
11 years ago
linhk af683f917d 解决新建版本库名非法类型成功新建
11 years ago
linhk b545c5034d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 34af8053cc Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
z9hang 05186c8590 项目积分存数据库
11 years ago
linhk d8964d81a8 用户注册lastname超长报错
11 years ago
z9hang 2c77d1b4cf 访问资源库问题
11 years ago
sw 9cb026ed39 增加竞赛删除评论的功能
11 years ago
sw c5a7497910 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang acb41158e7 错误提示页面导航栏添加
11 years ago
sw 9e5f7e6fc6 取消主页加入课程链接
11 years ago
sw 2c689b6399 删除竞赛时删除竞赛下所有作品
11 years ago
sw bb6be3ed8a 修改html错误
11 years ago
sw 41d983e904 取消过期缺陷邮件的发送(很有问题)!!!
11 years ago
sw 1f4943483e 1.现在竞赛作品名称、开发人员、开发环境的长度
11 years ago
z9hang 952fcce0de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang c60188038e 得分机制修改
11 years ago
sw c1bbd8a535 对于设置了完成日期的缺陷,到日期还没解决,给相关人员发一个通知邮件
11 years ago
z9hang 225e3c396a 个人得相关分方法添加
11 years ago
nwb dfdc58719a 课程主留言添加删除功能
11 years ago
yanxd 979d6dd067 dts_test. controller ===> model
11 years ago
z9hang 97531960da 首页定制添加剂修改图片大小功能
11 years ago
sw 70003c8374 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 6d5f72326f 增加定时任务
11 years ago
z9hang 3b54def1c7 首页定制修改
11 years ago
z9hang 4542b9e21a 积分修改
11 years ago
z9hang fb6cd2e9d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 0b6168c7fd 添加竞赛首页发布通知通告相关代码
11 years ago
yanxd 18d096f0d8 删除项目,竞赛表project_id会置空,projecting_softapplications模型不知道干嘛用,此表也不存在
11 years ago
nwb 5954ba1788 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb cf11cac0ad 项目文档权限判断优化
11 years ago
yanxd 8496d6e0d2 删除project多余导致删除项目失败的关联关系
11 years ago
nwb 518edeac68 项目文档浏览BUG修改
11 years ago
nwb 49aa3a994e 学时不允许为空
11 years ago
sw 79c76d26c8 创建作品分类表,并插入部分数据
11 years ago
yanxd 6af11fea68 course class period
11 years ago
nwb 0e9a15aad5 短描述修改
11 years ago
nwb bc50d5f469 允许上传空文件
11 years ago
nwb c443de5873 去掉课程名称验证
11 years ago
nwb 6968039c87 修改课程学生计算函数
11 years ago
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 8eac756ac7 1.项目首页的描述更改,不再限制项目描述字数
11 years ago
yanxd 164ec645ee boards created frequently, css file file EOF.
11 years ago
yanxd 4eee70a845 course new/created test
11 years ago
nwb b34a8d6166 项目搜索优化
11 years ago
z9hang 8d181c4e93 迁移文件出错问题
11 years ago