yutao
|
f4f7e9e6c4
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
db/schema.rb
public/javascripts/course.js
|
11 years ago |
yutao
|
4494e5cd64
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yutao
|
065c196edc
|
...
|
11 years ago |
huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
11 years ago |
sw
|
a58a548095
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
guange
|
5279c2d3e5
|
删除所有的域的autologin
|
11 years ago |
sw
|
356dd21c52
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
sw
|
bcb1b8dc39
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
guange
|
aaf7d645ba
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
guange
|
1fe49c8cb1
|
添加删除作业功能
|
11 years ago |
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
11 years ago |
huang
|
df5c040aab
|
添加项目issue复制功能
|
11 years ago |
huang
|
04c54d4f6e
|
项目新闻显示页面时间和附件换位
|
11 years ago |
huang
|
95f3d89afa
|
项目新闻添加编辑器:显示页面、列表页面新样式显示
|
11 years ago |
huang
|
e0ea57b213
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
sw
|
93c4a54598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
sw
|
05674f991f
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
huang
|
6bf76fdba1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
huang
|
1e8ef39369
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
huang
|
f770702d0b
|
issue编辑时候去掉铅笔图标
|
11 years ago |
huang
|
5af284e8a4
|
项目资源统计代码优化
|
11 years ago |
guange
|
1919292c58
|
还是issues count计算问题
|
11 years ago |
lizanle
|
144b68df19
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
lizanle
|
10e24bebd5
|
动态首页改变
|
11 years ago |
huang
|
6bb649e831
|
issue引用在项目动态的显示格式调整
|
11 years ago |
guange
|
1975df63d4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
guange
|
3fa5179026
|
issue数统计拖慢性能
|
11 years ago |
guange
|
9ce1916fbb
|
autologin token cookies domain修改
|
11 years ago |
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
11 years ago |
huang
|
a7aa83be8c
|
module配置未选时候,禁止其它方式的访问
去掉无用文件代码
|
11 years ago |
huang
|
b89ff45fc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
11 years ago |
lizanle
|
aa86be1d8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
lizanle
|
3318d11c6d
|
个人留言
|
11 years ago |
huang
|
fc8b5c60c6
|
切换分支处理
|
11 years ago |
sw
|
6d85535a4d
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
lizanle
|
122de16180
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
lizanle
|
42fab7c784
|
schema
|
11 years ago |
guange
|
437d4e1009
|
zip下载必须得登录
|
11 years ago |
guange
|
c9b46e4e3a
|
头像上传bug修复
|
11 years ago |
lizanle
|
3fc02585c5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
lizanle
|
6353a2e2c8
|
留言分页
|
11 years ago |
sw
|
0769da1426
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
sw
|
26ae4b7d74
|
用户头像不能上传
|
11 years ago |
sw
|
14aa3e83a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
sw
|
822ac5ade8
|
公共贴吧引用上传图片异常
|
11 years ago |
yutao
|
fa26f649f2
|
...
|
11 years ago |
yutao
|
8781eb3238
|
...
|
11 years ago |
sw
|
85b7a43cb1
|
Merge branch 'szzh' into develop
|
11 years ago |
sw
|
74fe58217f
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
sw
|
3b433cb751
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
yutao
|
c4c2da48db
|
修复bug#2485:项目--问题跟踪相关建议
|
11 years ago |
huang
|
ceafa459fd
|
issues编辑时跳转问题
|
11 years ago |
huang
|
4ab6558a5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
huang
|
379de18cd6
|
修改资源库全站搜索:
1、搜索条件为空的时候,不允许显示全部资源
2、全站搜索,非自己上传的资源不允许查看
3、全站搜索,项目管理员能设置公开权限的资源在全局搜索中也可以
|
11 years ago |
yutao
|
491a7a13aa
|
bug#2659
|
11 years ago |
yutao
|
a7de4b4646
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yutao
|
5460e98526
|
...
|
11 years ago |
huang
|
2ac2884bf1
|
修改issue注入异常报错(比如项目名带点号)
|
11 years ago |
yutao
|
53503bffe4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yutao
|
9c84837492
|
...
|
11 years ago |
huang
|
052d293f82
|
新建项目时候:
如果我的项目中有重名的项目不允许新建
|
11 years ago |
guange
|
b5d9cf55ff
|
将域名配置加入到管理员后台
|
11 years ago |
sw
|
47ce289bb6
|
Merge branch 'szzh' into develop
|
11 years ago |
sw
|
78cb9815a7
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
sw
|
ec1c9c2ac1
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
sw
|
016432ad08
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yutao
|
a6e15f5609
|
...
|
11 years ago |
yutao
|
cb395a33f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yutao
|
04e9618a59
|
修复bug#2357:项目--邀请注册用户,成功搜索后若忘了选择用户或角色直接邀请,建议不要再让用户重新搜索了
|
11 years ago |
huang
|
67061d0ee5
|
允许新建重名项目
|
11 years ago |
huang
|
fcb5444076
|
修改竞赛搜索结果页面按钮异常
|
11 years ago |
huang
|
eb539073ec
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
huang
|
975b19c5de
|
修改缺陷“添加于”“更新于”逻辑
|
11 years ago |
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
11 years ago |
yutao
|
a7e2e4766a
|
修复bug#2480:course主页查询课程输入关键字“数据库”,如图课程“课程简介”字样被截断了
|
11 years ago |
yutao
|
8af59f6f39
|
修复bug#2621:课程实践平台—课程作业—发布作业:编辑器的框大小可以任意伸缩,在伸缩后,不能还原。
|
11 years ago |
yutao
|
30bc053f47
|
...
|
11 years ago |
yutao
|
bfb0a43de1
|
修复bug#2485:项目--问题跟踪相关建议
|
11 years ago |
guange
|
eb73ba0b43
|
kindeditor界面打开时,有一个这个界面的过渡
|
11 years ago |
guange
|
689ec5cdfc
|
课程通知列表更多功能bug
|
11 years ago |
lizanle
|
2047f17191
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
lizanle
|
8e04b4e565
|
回复留言
|
11 years ago |
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
guange
|
e3633e702c
|
firefox样式问题
|
11 years ago |
sw
|
13a8911795
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
guange
|
1355dc805f
|
用户界面返回500错误 #2610
|
11 years ago |
guange
|
9b0602fd9c
|
新增学生作业下载spec
|
11 years ago |
guange
|
1226f74750
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
guange
|
d546069051
|
spec 清理
|
11 years ago |
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
sw
|
18bd667726
|
Merge branch 'szzh' into develop
|
11 years ago |