Commit Graph

11797 Commits

Author SHA1 Message Date
Your Name 2275fe6d23 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-22 11:26:03 +08:00
Your Name 9e7cde6056 stable version for sonar 2016-06-22 11:25:59 +08:00
huang 494b69c89b sonar数据获取 2016-06-22 09:12:57 +08:00
huang dee53a1383 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/repositories/_quality_analyses.html.erb
2016-06-21 16:51:58 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
Your Name 26b7c3e70b aqulity analysis 2016-06-21 16:46:34 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
huang 96e00f7bf3 jenkins连接 2016-06-20 16:21:37 +08:00
huang 36e47fa8b1 代码质量分析,弹框参数传递 2016-06-20 14:21:40 +08:00
huang d0791253d9 quality 2016-06-17 11:29:49 +08:00
huang fea21fe7cd Merge branch 'develop' into rep_quality 2016-06-17 10:36:09 +08:00
huang d127c6e12c 访问添加自某年某月 2016-06-17 09:45:10 +08:00
huang 312fa61489 输入框线条 2016-06-16 15:57:30 +08:00
huang 6707868915 登录页面新样式 2016-06-16 15:52:54 +08:00
huang d2d15710b5 解决chrome浏览器背景黄色问题 2016-06-16 15:25:43 +08:00
yuanke 7df91ebf70 修改课程资源描述空白的提示语 2016-06-16 14:14:54 +08:00
yuanke 4cd321f363 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-16 14:11:17 +08:00
yuanke 049a21c7d0 不上线的先还原 2016-06-16 14:08:54 +08:00
huang 072807fe37 1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议 2016-06-16 14:07:37 +08:00
yuanke 82ebd1e4c9 Merge branch 'yuanke' into develop 2016-06-16 14:04:53 +08:00
yuanke 2781605670 课程资源描述增加可编辑 2016-06-16 14:04:12 +08:00
huang 8f73cba44b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-16 10:36:40 +08:00
huang 41bb68d0e1 Merge branch 'hjq_login' into develop 2016-06-16 10:36:30 +08:00
huang 5e3df51ad9 完成新版登录注册 2016-06-16 10:21:21 +08:00
huang aa42044199 注册登录 2016-06-15 17:58:02 +08:00
huang 06f97d5cb7 注册页面(未完) 2016-06-15 17:24:46 +08:00
yuanke 1023b94f0d 新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项 2016-06-15 17:22:39 +08:00
yuanke ec4273fc49 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 17:08:24 +08:00
yuanke a17fb86a17 组织回复点登录直接跳入登录页面 2016-06-15 17:07:29 +08:00
huang 9b6f40bb02 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-06-15 15:43:42 +08:00
huang a2c5cc6da1 登录界面base及新页面 2016-06-15 15:41:13 +08:00
yuanke 5a7f7da1f7 新建贴吧和组织配置默认选项暂时还原。 2016-06-15 15:34:13 +08:00
huang d75a8bc35a Merge branch 'hjq_beidou' into develop 2016-06-15 14:49:10 +08:00
huang 45f185bf9b Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-06-15 14:38:16 +08:00
huang c15ef27fc0 管理员能看到组织资源 2016-06-15 14:36:38 +08:00
yuanke 7b6e8fbc53 修改组织点击登录后可回复报500的BUG 2016-06-15 14:33:25 +08:00
Tim f7832b00c9 更新历史版本时描述位置调整 2016-06-15 14:02:09 +08:00
huang 5515fb660f 完成资源更新的时候 描述继承问题,并且可以修改描述 2016-06-14 14:47:02 +08:00
huang d21df48961 代码质量分析弹框及参数传入 2016-06-14 14:10:33 +08:00
huang c6bd5e6d31 饼状图 2016-06-14 09:57:53 +08:00
huang 9029fd91e0 rails 代码中调用shell命令调用 2016-06-14 09:57:29 +08:00
yuanke 44c9265fee 个人主页个性签名增加自动识别url 2016-06-13 15:29:15 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
yuanke e86419c28b 组织配置里面栏目类型默认为帖子 2016-06-13 13:35:01 +08:00
yuanke 3a46a409a9 Merge branch 'develop' into yuanke 2016-06-13 09:46:17 +08:00
yuanke f2903ae903 新建贴吧后自动跳入该贴吧 2016-06-13 09:45:11 +08:00
guange 0a82de1cf4 中文问题 2016-06-12 17:25:47 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange 1cb63055cb api可以通过openid来认证 2016-06-12 17:18:05 +08:00
huang d4d4e38c41 门户模式中含有三级域名的用户图像https问题 2016-06-12 16:48:35 +08:00