 lizanle
|
b2bca65025
|
分片默认为5
|
10 years ago |
|
lizanle
|
e728dd55eb
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
e710f443c2
|
全站搜索
|
10 years ago |
|
lizanle
|
7cb39d1754
|
全站搜索
|
10 years ago |
|
lizanle
|
ee47187a61
|
全站搜索
|
10 years ago |
|
lizanle
|
dcd441a9db
|
全站搜索
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
 ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
 huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
10 years ago |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
10 years ago |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
10 years ago |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
10 years ago |
|
huang
|
353e2f5d18
|
添加课程消息迁移
|
10 years ago |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
10 years ago |
guange
|
7d0a53ec86
|
merge
|
10 years ago |
|
huang
|
c198a03a90
|
DTS测试工具
|
10 years ago |
|
guange
|
3614c6ee9b
|
project同步
|
10 years ago |
 sw
|
749b9c4429
|
项目列表根据ID排序
|
10 years ago |
|
sw
|
1cff2a85e9
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
huang
|
e40f1a570e
|
添加邮件邀请成员列表
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
huang
|
7197c33be4
|
注释掉暂时未完成的功能
|
10 years ago |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
10 years ago |
|
huang
|
67061d0ee5
|
允许新建重名项目
|
10 years ago |
|
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
10 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
10 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
lizanle
|
87394fe4ce
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，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 |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 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
|
10 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
10 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
10 years ago |
|
lizanle
|
03ae5fdeac
|
添加注释
|
10 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
 alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 z9hang
|
6180943f72
|
空数据库时创建项目报错问题，原redmine的项目按字母排序功能导致，现在项目没有按字母排序，故将之注释掉
|
11 years ago |
ShengYue.Xu
|
047f6d2c95
|
修改了缺陷当中 #868、#780、#603
|
11 years ago |
 yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
11 years ago |
|
yanxd
|
8496d6e0d2
|
删除project多余导致删除项目失败的关联关系
|
11 years ago |
 nwb
|
518edeac68
|
项目文档浏览BUG修改
|
11 years ago |
|
nwb
|
0e9a15aad5
|
短描述修改
|
11 years ago |
|
nwb
|
28543e3288
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
8eac756ac7
|
1.项目首页的描述更改，不再限制项目描述字数
2.竞赛首页的描述更改，不再限制竞赛描述字数
|
11 years ago |
