 z9hang
|
610746301f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
11 years ago |
 sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
11 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
11 years ago |
 huang
|
ba09213023
|
添加新闻模块、部分样式
|
11 years ago |
|
sw
|
b292df42d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c6788e2f40
|
修复首页报错
|
11 years ago |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
749e10592d
|
修改邮件页面样式
|
11 years ago |
|
sw
|
fea7bd6ad1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3f3bb62678
|
非项目成员添加新闻、添加讨论区按钮不可见
|
11 years ago |
 lizanle
|
77f81ac171
|
kaminari分页配置
|
11 years ago |
|
lizanle
|
a701eb91a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
11 years ago |
|
sw
|
945b9ff9cf
|
修复进入我的动态，关注人没有进行权限过滤的BUG
|
11 years ago |
|
alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
3e3cde0805
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
|
11 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
11 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fd97302947
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
11 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
11 years ago |
|
alan
|
c144544eb4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
f50ea0f780
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
f898e2aa91
|
16:22
|
11 years ago |
|
z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
11 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
|
11 years ago |
|
z9hang
|
754acc6945
|
移动端版本管理
|
11 years ago |
|
alan
|
2e0187fc5a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
001b8bb112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
108856edf1
|
增加忽略文件
|
11 years ago |
|
alan
|
364d2affeb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
d390c84de0
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
9e2c479590
|
new project
|
11 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
11 years ago |
|
sw
|
a009c5a023
|
Merge branch 'dev_zanle' into szzh
|
11 years ago |
|
sw
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
sw
|
e58f5d4af5
|
#1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储
|
11 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
|
lizanle
|
10faab0129
|
新建的项目发布新问题报500
|
11 years ago |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
11 years ago |
|
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
11 years ago |
