whimlex
|
7fd77f0354
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
89a001ad9d
|
IE8浏览器及以下低版本浏览器提示
|
10 years ago |
 lizanle
|
05cf90062f
|
论坛的描述如果有图片的话，图片会显示。使排版出现问题
|
10 years ago |
|
lizanle
|
cd976f9515
|
如果论坛的description上传了图片，那么这个图片会显示，使得论坛的界面被图片占据。
|
10 years ago |
|
lizanle
|
d1d40e1867
|
添加一个输入框的id，在论坛模块里，自动生成的id会和编辑器kindeditor生成的id冲突：都叫memo_content
|
10 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
 huang
|
eac6f814a8
|
解决浏览器提示关闭按钮与邮件邀请界面冲突
|
10 years ago |
|
huang
|
792a87dcaf
|
修改提示框引起的首页行距过高的问题
|
10 years ago |
|
huang
|
75567585d2
|
浏览器版本过低提示样式调整！
|
10 years ago |
|
huang
|
525a6394ca
|
1、公共贴吧邮件提醒
2、浏览器版本过低提醒（样式需要再调试）
|
10 years ago |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
10 years ago |
|
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
10 years ago |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
10 years ago |
|
whimlex
|
6995ead66c
|
项目ID
|
10 years ago |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
10 years ago |
 dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
10 years ago |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
10 years ago |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
10 years ago |
 alan
|
cf3d836cf3
|
删除邮件发送时出现《"亲爱的Trustie用户，您好！"》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
10 years ago |
 sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
10 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
10 years ago |
|
huang
|
cc5a22f2c6
|
修改新建按钮样式
|
10 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
10 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
10 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
10 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
10 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
10 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
10 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
10 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
10 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
10 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
10 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
10 years ago |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
10 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
10 years ago |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
10 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
