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 |
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
|
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 |
alan
|
3315116832
|
修改《课程--留言:给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
|
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
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
9c45e372b4
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
alan
|
479a1249ae
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
5191411508
|
<邮件加密自动登录功能,邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
lizanle
|
75ba61ed74
|
issue 1798 ,用户名出现不显示的情况
|
11 years ago |
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
alan
|
2bba0ddd70
|
添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
z9hang
|
b6826a74d3
|
问卷显示
|
11 years ago |
alan
|
2f147dcddd
|
增加《邮件地址自动登录功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
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的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
11 years ago |
alan
|
2262997c31
|
修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题,例如个人主页左侧的信息,具体如图所示》
《本地版中关于学生列表的分组出现的问题:当前已存在A组,再次添加A组应给出提示“A组已存在”,该功能目前只有在学生列表首次加载时才正常》
《托管,课程,竞赛主页中任意点击某一项目,进入该项目主页,右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页,点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |