 huang
|
0917030395
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
10 years ago |
|
huang
|
69050b4271
|
指派给自己的缺陷不发送消息提示
|
10 years ago |
|
huang
|
5dd2befe88
|
添加消息看过后即不显示功能
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
 sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
sw
|
053587bd53
|
课程动态增加课程创建信息的动态
|
10 years ago |
|
sw
|
ce76308864
|
课程动态，历史数据的迁移
|
10 years ago |
|
huang
|
998fe24e49
|
建立forge_messages表
建立user、project关联
|
10 years ago |
|
sw
|
465af5e2d3
|
增加课程动态，以及课程内相关活动时动态的添加
|
10 years ago |
|
huang
|
5f87d5806b
|
解决留言消息提示中遗留的bug
|
10 years ago |
|
huang
|
82747a7690
|
留言添加消息提示
|
10 years ago |
guange
|
f082ff745e
|
同步members
|
10 years ago |
|
guange
|
9d8596a14c
|
新增gitlab adapter用于适配gitlab命令
|
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
|
11afcaf17c
|
没有昵称的用户显示为：匿名用户
个人主页留言换行
|
10 years ago |
|
sw
|
f5cfd7258d
|
修改编程作业时，对已通过测试、未通过测试显示的初始化，以及修改时的结果的存储
|
10 years ago |
|
guange
|
909521df54
|
Merge remote-tracking branch 'origin/szzh' into gitlab_guange
|
10 years ago |
|
huang
|
f95fa6b5e7
|
修复：项目名称带点号，issue回复的404问题
项目名称全数字：不能留言等问题
|
10 years ago |
|
huang
|
ed27b6e30f
|
申请加入邮件通知添加自动登录功能
|
10 years ago |
|
guange
|
bf5f7f8d4f
|
加入分支参数
|
10 years ago |
|
guange
|
0a300724d3
|
统计结果改为数组返回
|
10 years ago |
|
guange
|
71970e1942
|
支持按时间段来统计每人的提交量
|
10 years ago |
|
sw
|
01576449c8
|
编译结果显示错误
|
10 years ago |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
10 years ago |
|
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
sw
|
cfbd50e474
|
student_work和student_work_test关系：1对多
|
10 years ago |
|
sw
|
9f72b25360
|
编程作业结果显示问题
|
10 years ago |
|
huang
|
5926b2fe81
|
dts测试
|
10 years ago |
|
huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
 yutao
|
679ad8406d
|
课程主页
|
10 years ago |
|
yutao
|
f4b88dce70
|
个人主页
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
yutao
|
2efb4833f2
|
个人主页
|
10 years ago |
|
sw
|
1f6ed64e54
|
删除作品时，删除作品的点赞数
|
10 years ago |
|
yutao
|
8d858cccfc
|
个人主页
|
10 years ago |
|
sw
|
93905f2f32
|
界面显示
|
10 years ago |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
10 years ago |
|
guange
|
006ed66d7a
|
新注册用户可以同步到gitlab
|
10 years ago |
|
sw
|
67c054e3af
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
10 years ago |
|
yutao
|
00c50d8114
|
个人主页->访客
|
10 years ago |
|
guange
|
3614c6ee9b
|
project同步
|
10 years ago |
|
sw
|
cf4c6c83d3
|
作业积分改为总分
|
10 years ago |
|
huang
|
dae15840b8
|
新注册用户邮件默认缺省值按天发送
|
10 years ago |
|
huang
|
7ebdf4a08d
|
issue列表增加优先级
修改issue列表界面
|
10 years ago |
|
huang
|
3e88d62ba6
|
修改课程附件问题
|
10 years ago |
|
huang
|
02805fd145
|
1、修改邮件显示样式及国际化
2、发布作业代码更新
|
10 years ago |
|
huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
0430a0e810
|
修改journals查询错误
|
10 years ago |
|
huang
|
6da8cf237d
|
邮件按天发送，内容按课程划分
|
10 years ago |
|
huang
|
b5badbd25f
|
项目中邮件通知按项目排序
|
10 years ago |
|
huang
|
f8a35d2f97
|
邮件：缺陷按项目排序
|
10 years ago |
|
yutao
|
0a0f5d98db
|
课程动态 加入 与我相关
|
10 years ago |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
10 years ago |
|
huang
|
def0e892af
|
解决公共贴吧发布内容过长500错误
|
10 years ago |
|
huang
|
39eb6a5f7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
af59cd9ba7
|
1、项目issue区分主贴和回帖
2、引用模式修改
|
10 years ago |
|
sw
|
749b9c4429
|
项目列表根据ID排序
|
10 years ago |
|
huang
|
dd33210d05
|
区分缺陷回复合主贴
|
10 years ago |
|
huang
|
4092077923
|
不同课程邮件多条记录按desc排序
|
10 years ago |
|
huang
|
2f8c8ea6ca
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
huang
|
64da95e900
|
去掉冗余代码
|
10 years ago |
|
sw
|
8a3a0af20f
|
学生列表作业积分弹框内容
|
10 years ago |
|
huang
|
28e9c090ec
|
实时发送：发布作业邮件通知
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
huang
|
cf9455e465
|
课程发布作业添加到邮件中
|
10 years ago |
|
huang
|
e1b059b3d2
|
上传项目资源添加到邮件按天发送
|
10 years ago |
|
huang
|
c8884c6fd4
|
修改邀请用户url，隐藏userid防止注入
|
10 years ago |
|
huang
|
59dcfcbb1a
|
添加邮件回复（课程通知、项目新闻、缺陷更新回复）页面
|
10 years ago |
|
huang
|
4bb674bcae
|
课程通知、项目新闻回复 邮件查询语句
|
10 years ago |
|
huang
|
014f830b1d
|
添加issue回复邮件发送内容
|
10 years ago |
|
huang
|
aacd3af1fe
|
缺陷状态更新后，按天发送邮件通知
|
10 years ago |
|
sw
|
21a9a67bfc
|
移除bid
|
10 years ago |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
10 years ago |
|
sw
|
b44f5ef522
|
弹出框显示为作业名称
|
10 years ago |
|
sw
|
f956b27953
|
作业积分显示平均分
|
10 years ago |
|
huang
|
7bf4cfd218
|
修改个人留言在按天发送中查询条件
|
10 years ago |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
10 years ago |
|
huang
|
c72f522493
|
邮件按天发送中添加wiki
|
10 years ago |
|
huang
|
0d9bdae5b0
|
邮件按天发送新界面
|
10 years ago |
|
huang
|
05a77caeda
|
去掉讨论区重复及统计数量错误
|
10 years ago |
|
huang
|
999e96a857
|
取消掉打印attachment
|
10 years ago |
|
huang
|
52f7c66ff0
|
修复课程讨论区中邮件通知重复的问题
|
10 years ago |
|
sw
|
1a3a23b0ed
|
BId已取消留言功能
|
10 years ago |
|
huang
|
c85fd9f7b8
|
处理新作业模块的冲突
|
10 years ago |
|
sw
|
f675211642
|
学生作品列表，没有真实姓名就显示login，作品附件导出也一样
|
10 years ago |
|
guange
|
971755c74a
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
0c19199be9
|
按天发送中添加项目新闻
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
huang
|
52bbb92c9f
|
课程通知邮件内容显示修改（新编辑器下不能使用）
|
10 years ago |
|
huang
|
c39e0bf3db
|
项目成员邀请添加：
邀请等待
已邀请的成员列表
|
10 years ago |
|
guange
|
444658d0b3
|
转换变为既时转换
|
10 years ago |
|
guange
|
d3baada893
|
在更新Attachments时也要更新
|
10 years ago |
|
guange
|
3f9c5764e9
|
.
|
10 years ago |
|
guange
|
d2eb51bbb6
|
只处理资源库的文件
|
10 years ago |
|
huang
|
e40f1a570e
|
添加邮件邀请成员列表
|
10 years ago |
|
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 |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
10 years ago |
|
sw
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
10 years ago |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
10 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
10 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
10 years ago |
|
lizanle
|
8d322edb90
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/views/projects/show.html.erb
|
10 years ago |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
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
Conflicts:
Gemfile
Gemfile.lock
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
z9hang
|
ef203ff40c
|
修正作业留言接口
|
11 years ago |
|
alan
|
44c783a61b
|
帖子的邮件通知改成只有版主收到
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
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
Conflicts:
Gemfile.lock
|
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
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
a467736a5e
|
修改《多字段唯一性判断》
Signed-off-by: alan <547533434@qq.com>
|
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
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
11 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
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
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
alan
|
61634585f5
|
修改《news，forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
e96302d219
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
b20204fedd
|
修改《邮件重发一样引发的bug》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
03ae5fdeac
|
添加注释
|
11 years ago |
|
alan
|
8f1249390a
|
修改《发送多封相同邮件》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
