 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 |
