jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,569 Commits 98 Branches 0 Tags 0 B
Commit Graph

107 Commits

Author SHA1 Message Date
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-16 09:07:38 +08:00
huang 554927d517 删除项目的时候，项目动态级联删除 2015-10-15 10:07:46 +08:00
huang 73898953d9 project表添加字段，记录project对应gitlba中project id 2015-10-13 10:58:22 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00
huang b0ccf9037a 邮件邀请： 
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
 2015-09-15 17:39:57 +08:00
huang 353e2f5d18 添加课程消息迁移 2015-08-29 16:08:09 +08:00
huang ee778b5968 1、增加issue消息提醒（发送给指派的人） 
2、下拉框形式区分消息
3、相关关联
 2015-08-12 17:45:17 +08:00
guange 7d0a53ec86 merge 2015-07-21 20:56:33 +08:00
huang c198a03a90 DTS测试工具 2015-07-19 20:08:57 +08:00
guange 3614c6ee9b project同步 2015-07-12 15:56:15 +08:00
sw 749b9c4429 项目列表根据ID排序 2015-07-01 17:02:30 +08:00
sw 1cff2a85e9 Merge branch 'dev_hjq' into szzh 2015-06-04 17:45:51 +08:00
huang e40f1a570e 添加邮件邀请成员列表 2015-06-03 18:11:52 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
huang 7197c33be4 注释掉暂时未完成的功能 2015-05-29 16:07:57 +08:00
huang cae882b3d6 新增邮件状态表 
相关关联
 2015-05-28 14:44:04 +08:00
huang 67061d0ee5 允许新建重名项目 2015-05-22 11:18:31 +08:00
sw 6ac97f2c34 1、迁移文件增加回滚方法 
2、作品表增加所属项目字段
 2015-05-21 10:54:02 +08:00
guange 38ec84cde9 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
lizanle 87394fe4ce issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:27:32 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +08:00
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
 2015-01-30 14:27:56 +08:00
sw 36c07f9664 修改拒绝项目成员加入后，页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
lizanle 03ae5fdeac 添加注释 2015-01-23 09:47:22 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
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>
 2014-11-13 09:59:20 +08:00
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>
 2014-09-15 10:58:14 +08:00
z9hang 6180943f72 空数据库时创建项目报错问题，原redmine的项目按字母排序功能导致，现在项目没有按字母排序，故将之注释掉 2014-09-11 17:26:17 +08:00
ShengYue.Xu 047f6d2c95 修改了缺陷当中 #868、#780、#603 2014-08-21 19:57:49 +08:00
yanxd 979d6dd067 dts_test. controller ===> model 2014-07-28 09:22:52 +08:00
yanxd 8496d6e0d2 删除project多余导致删除项目失败的关联关系 2014-07-22 09:17:21 +08:00
nwb 518edeac68 项目文档浏览BUG修改 2014-07-22 09:15:19 +08:00
nwb 0e9a15aad5 短描述修改 2014-07-18 16:41:55 +08:00
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 09:21:21 +08:00
nwb 8eac756ac7 1.项目首页的描述更改，不再限制项目描述字数 
2.竞赛首页的描述更改，不再限制竞赛描述字数
 2014-07-18 09:21:09 +08:00
yanxd 164ec645ee boards created frequently, css file file EOF. 2014-07-18 09:20:16 +08:00
nwb b34a8d6166 项目搜索优化 2014-07-16 17:25:47 +08:00
nwb 13a3725b06 BUG修改 2014-07-16 09:28:12 +08:00
sw 59a5541e45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-11 14:52:15 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件 
2.资源文件添加文件密级设置
 2014-07-11 09:07:09 +08:00
sw 7bcb1cbe2e 修复个人主页中作业、项目介绍不正确的BUG 2014-07-10 16:57:04 +08:00
nwb eb15edd5ff 1.添加文档 
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
 2014-07-05 13:31:32 +08:00
sw 740f6a19ec 项目名称唯一 2014-07-03 15:50:36 +08:00