Commit Graph

2078 Commits

Author SHA1 Message Date
huang 2e94fbee81 项目、课程、组织资源描述过长不能提交的问题 2016-10-09 15:09:18 +08:00
huang b573563a52 Merge branch 'rep_quality' into develop 2016-09-28 10:59:55 +08:00
daiao b22b444a7b 修改issue开始时间与结束时间判断,并将导出excel的作者改为发布人 2016-09-28 10:58:31 +08:00
huang d647f7153a 新建里程碑术语 2016-09-27 20:01:23 +08:00
huang 70d58ea28e 版本库导出代码统计功能 2016-09-27 15:10:52 +08:00
daiao 1c33e6481f 问题issue列表及其动态的目标版本改为里程碑, 2016-09-27 10:48:39 +08:00
huang b1496e1874 项目邀请码去掉冒号 2016-09-27 09:15:19 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-09-26 22:21:45 +08:00
huang 3ace67f706 版本库库代码统计导出excel功能 2016-09-26 16:17:21 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00
cxt caf5602389 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
Tim c718cb2144 新建issue时,增加评审,来源,实际工时选项 2016-09-21 15:27:32 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
huang 4d97dd3889 去掉项目module中dts测试工具 2016-09-19 17:22:30 +08:00
huang 8e6a88f7d8 项目日历功能 2016-09-19 16:19:59 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
daiao ed448f0087 Merge branch 'develop' into dev_shcool
Conflicts:
	db/schema.rb
2016-09-09 09:31:17 +08:00
yuanke 5b8ecf6657 微信头像刷新修改 2016-09-08 18:50:09 +08:00
yuanke 18fbf305c1 微信上传头像大小限制为1M 2016-09-07 16:16:53 +08:00
yuanke c9c63eeb85 微信修改资料后台代码 2016-09-06 14:41:22 +08:00
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
2016-09-05 13:47:39 +08:00
yuanke 10017d2c69 微信增加解除绑定功能 2016-09-05 11:02:34 +08:00
daiao 27ad94eac2 组织配置界面,成员列表分页 2016-09-02 13:25:01 +08:00
yuanke 11ed1ea345 Merge branch 'weixin_guange' into develop 2016-09-01 14:11:20 +08:00
yuanke 8a6ad89973 issue指向改变才发微信消息,增加微信动态里来源链接,@增加微信消息,菜单去掉加入班级和项目等 2016-08-30 14:08:10 +08:00
cxt 6eb518c465 Merge branch 'cxt_course' into develop
Conflicts:
	app/helpers/application_helper.rb
	app/views/at/show.json.erb
	app/views/layouts/new_base_user.html.erb
2016-08-26 16:23:07 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
cxt 60beb2abab 首页左侧班级和项目列表的收藏功能 2016-08-25 11:30:47 +08:00
yuanke 4932b9fad8 班级留言不显示 2016-08-25 10:55:22 +08:00
cxt 56b74b755b 取消收藏 2016-08-24 17:30:30 +08:00
yuanke e0957113d8 项目issue模版消息提醒 2016-08-24 11:28:50 +08:00
yuanke bd3911c072 . 2016-08-24 11:22:34 +08:00
yuanke f8dfe85156 项目issue增加模版消息 2016-08-24 11:03:38 +08:00
yuanke 9446760258 Merge branch 'weixin_guange' into develop
Conflicts:
	db/schema.rb
2016-08-14 09:56:17 +08:00
Tim f67336fbe5 课程信息单词折行 2016-08-13 16:27:29 +08:00
cxt 2759d562ac 首页项目列表 2016-08-13 15:35:03 +08:00
yuanke 4e6c58ae37 动态点提交如果没绑定则自动创建一个帐号绑定,然后注册的时候将已绑定的用户信息修改为注册的信息 2016-08-11 17:22:48 +08:00
yuanke ea926395c3 Merge branch 'develop' into weixin_guange 2016-08-11 11:19:52 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +08:00
yuanke 7c5240b386 微信 没登录动态回复会跳到绑定登录界面,私有内容需要是成员才能回复 2016-08-11 09:58:45 +08:00
yuanke 57737ff15d 微信细节优化 2016-08-10 16:08:30 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang 6319a1bac6 PR添加评论定义 2016-08-09 10:53:44 +08:00
yuanke 2b7ff3c76b 修改各个页面验证绑定登录的方式。 2016-08-09 09:23:06 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
huang 81ce93e88b Merge branch 'rep_quality' into develop 2016-08-05 15:28:39 +08:00
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
yuanke ee019cd364 修改测试版微信加入项目审核通知 2016-08-04 14:47:39 +08:00