Commit Graph

15315 Commits

Author SHA1 Message Date
huang 3a43b7beb5 redirect to repository when delete jenkins job 2016-07-20 11:20:48 +08:00
huang e99c76a0de resolve edit problem of jenkins job 2016-07-20 10:09:55 +08:00
yuanke bf600e8f76 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-20 10:09:37 +08:00
yuanke 1ce7b22c0e 博客动态回复二级回复修改 2016-07-20 10:09:27 +08:00
huang 1935176500 Merge branch 'develop' into rep_quality 2016-07-20 09:38:59 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
txz 53feb0bbd4 课程列表课程名称宽度限制 2016-07-20 09:11:05 +08:00
guange 674c45f1d9 去掉上传的csrf报错 2016-07-19 17:44:27 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
Tim eb503cc3e8 Merge branch 'develop' into cs_optimize_txz 2016-07-19 16:50:30 +08:00
Tim ce5cf8bf4f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-19 16:44:14 +08:00
txz 707df88c7f tab容器宽度百分百 2016-07-19 16:05:39 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
txz 5b3c6cc012 输入框高度控制 2016-07-19 15:41:40 +08:00
huang 26d4be6518 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-19 15:25:54 +08:00
huang 1a129722eb Merge branch 'rep_quality' into develop 2016-07-19 15:25:13 +08:00
huang 25da65d565 恢复gemfile 2016-07-19 15:24:50 +08:00
txz 2af1a5ffb9 新增班级和管理班级输入框高度控制 2016-07-19 15:07:11 +08:00
Tim 10871d26a2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-19 11:21:06 +08:00
huang 4e3bfd9254 some bugs for sonar show 2016-07-19 11:17:54 +08:00
txz 27965bee01 加入班级弹框样式统一 2016-07-19 11:17:46 +08:00
yuanke ea88c92d31 测试用 2016-07-19 10:54:04 +08:00
yuanke 80843d5084 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-19 10:50:46 +08:00
yuanke bc1b4c1b85 班级邀请码弹框修改,我的动态回复数计算修改 2016-07-19 10:50:36 +08:00
txz bc0d8cd299 管理班级重命名字体变灰 2016-07-19 10:25:45 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
huang 04fe06eff9 gitlab数据迁移 2016-07-19 09:39:47 +08:00
Tim 1fc2bbd56a 作业资源库弹框,资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +08:00
Tim 73401d6b41 下拉图标等显示 2016-07-19 09:09:13 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
yuanke b2f9839d13 微信:测试版菜单 2016-07-18 14:43:54 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz
Conflicts:
	app/views/versions/index.html.erb
2016-07-18 14:32:17 +08:00
Tim 76555680e0 项目css统一 2016-07-18 14:30:01 +08:00
yuanke fea8d56d8d 修改为测试版配置 2016-07-18 14:28:45 +08:00
yuanke ff13d2e572 微信增加作业发送,修改发送的权限,修改菜单 2016-07-18 14:24:59 +08:00
Tim 3940d8f558 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-18 14:18:18 +08:00
huang 412d74e295 优化最近动态获取方法 2016-07-18 13:57:00 +08:00
huang d94f9762ce Merge branch 'develop' into rep_quality 2016-07-18 11:27:41 +08:00
huang 5c046f922e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-18 11:25:57 +08:00
huang 097374df14 去掉全局变量,通过filter获取 2016-07-18 11:25:45 +08:00
huang 3198f8a473 解决版本库提交记录中:上传图片或者非可以预览文件 显示详情500问题 2016-07-18 11:17:22 +08:00
yuanke f3d74fcd55 Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:08:09 +08:00
guange cd69149d3a Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-07-18 11:09:53 +08:00
yuanke 8968c991ff 微信:作业增加发送功能 2016-07-18 11:08:02 +08:00
yuanke 51918e1340 Merge branch 'develop' into weixin_guange 2016-07-18 08:34:42 +08:00
guange 51692eadd6 改进上线流程 2016-07-17 00:49:35 +08:00
yuanke 7fe3f9fe71 配置改为测试版 2016-07-15 20:30:50 +08:00
yuanke cb060e518e 正式版配置 2016-07-15 20:25:08 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00