Commit Graph

142 Commits

Author SHA1 Message Date
huang 528aeaff89 Merge branch 'rep_quality' into develop 2016-09-26 22:20:08 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
yuanke 65bd77f0ff 微信二维码过期问题修改 2016-09-18 10:50:40 +08:00
huang 1588f5cfca 开发环境下不启动elastic 2016-08-09 16:31:14 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
yuanke fa43924330 微信项目二维码修改 2016-08-01 13:54:10 +08:00
huang c7f2ab0415 修复创建英文名字的项目标题为“为项目讨论区的问题” 2016-08-01 13:51:11 +08:00
yuanke f0cf7adcdf 加入项目邀请码 2016-08-01 11:14:03 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
2016-07-29 21:39:00 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
2016-07-29 19:39:42 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
huang 4a9eec0cce 完成项目邀请及公共弹框的封装 2016-07-28 14:42:36 +08:00
huang 774650c819 项目邀请码直接数据库读取,权限修改 2016-07-25 15:22:34 +08:00
yuanke b9b9a867f4 项目 2016-07-25 15:20:01 +08:00
huang 84d1adbf25 生成邀请码 2016-07-25 14:36:52 +08:00
huang 012eae9b93 gems 2016-06-24 19:54:01 +08:00
Your Name 244c178758 666 2016-06-24 17:39:10 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
huang 40b45ce1b4 版本库动态中统计改成从数据库获取 2016-04-15 12:24:54 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
huang e808f0bc61 提交新迁移 2016-01-14 11:37:10 +08:00
huang 1239a8b5af 统计数据迁移 2016-01-12 10:38:50 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
lizanle 2fbad38522 优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
2015-12-09 12:57:25 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
lizanle b2bca65025 分片默认为5 2015-12-01 10:33:57 +08:00
lizanle e728dd55eb Merge branch 'szzh' into dev_zanle
Conflicts:
	app/models/attachment.rb
	db/schema.rb
2015-11-27 19:02:07 +08:00
lizanle e710f443c2 全站搜索 2015-11-27 15:17:17 +08:00
lizanle 7cb39d1754 全站搜索 2015-11-27 10:40:58 +08:00
lizanle ee47187a61 全站搜索 2015-11-27 09:52:51 +08:00
lizanle dcd441a9db 全站搜索 2015-11-26 16:43:10 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
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