Commit Graph

15467 Commits

Author SHA1 Message Date
cxt 352b092980 质量分析 2018-03-15 11:18:42 +08:00
cxt 55afcd0e8c 加日志 2018-03-15 10:58:31 +08:00
cxt bb1963129d 质量分析加日志 2018-03-15 10:24:57 +08:00
cxt 1396a56e06 作品列表报500 2018-03-07 17:00:43 +08:00
daiao 4dbeda8c21 作业报500 2018-03-06 17:44:02 +08:00
daiao 64ec418376 详情有返回按钮 2018-02-09 18:51:47 +08:00
huang 1409995e66 https问题 2018-02-09 18:38:07 +08:00
huang 25a4d05eb8 解决http冲突问题 2018-02-09 18:34:47 +08:00
daiao cca2433332 上线缺陷报错 2018-02-09 18:26:44 +08:00
daiao d2fece9793 子类别为空时,搜索出错 2018-02-09 18:12:53 +08:00
daiao 432ca22daa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:20:13 +08:00
daiao 3bd7b4b7aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:19:51 +08:00
caishi 06e17790b5 详情图片 2018-02-09 17:19:48 +08:00
daiao e5f576f5ae 数据首页赛选 2018-02-09 17:19:31 +08:00
caishi 69e8969215 不能对数据主类别进行删除操作 2018-02-09 17:13:56 +08:00
daiao 2633f7dbfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:00:28 +08:00
daiao 2951166010 数据上线缺陷修复 2018-02-09 17:00:12 +08:00
caishi b9a7b47ca4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 16:37:00 +08:00
caishi 0f83e7712e 显示详情样式修改 2018-02-09 16:36:42 +08:00
daiao 7f8a612a01 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 16:26:52 +08:00
daiao 92b54b3bb6 上线缺陷修复 2018-02-09 16:26:44 +08:00
huang 4cae214990 数据顶部搜索局部刷新问题 2018-02-09 16:25:29 +08:00
huang 1a1acaff27 导航数据偶尔500问题 2018-02-09 16:08:52 +08:00
caishi 9c02de788d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:55:07 +08:00
caishi ce939c57a8 主类别 2018-02-09 15:54:49 +08:00
daiao 670f65d10c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:42:50 +08:00
daiao 2f59564a40 课程报500 2018-02-09 15:42:43 +08:00
huang 1b9cb4e508 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:19:30 +08:00
huang 205147cc5c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/statistics_controller.rb
2018-02-09 15:19:17 +08:00
caishi 953d8de96f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/statistics/show.html.erb
2018-02-09 15:17:03 +08:00
caishi 4d0336497d 编辑返回 2018-02-09 15:11:34 +08:00
huang b89b778872 修复附件编辑的时候偶尔不成功的问题 2018-02-09 15:03:28 +08:00
daiao 08433fba31 显示数据大小 2018-02-09 13:53:05 +08:00
daiao 9e64872470 附件权限控制 2018-02-09 11:30:43 +08:00
daiao 71e3ff3df6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 11:27:41 +08:00
daiao bc70b1a3e0 数据权限控制 2018-02-09 11:27:32 +08:00
caishi 92325f1107 详情显示 2018-02-09 11:09:16 +08:00
daiao 3c1bc10274 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/statistics/show.html.erb
2018-02-09 11:06:35 +08:00
daiao 9da515a318 数据详情页面修改 2018-02-09 11:05:26 +08:00
caishi 818535492f 上传图片弹框样式 2018-02-09 11:04:41 +08:00
caishi 21db2d1f18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/statistics/show.html.erb
2018-02-09 10:57:21 +08:00
caishi a029f36808 样式 2018-02-09 10:56:40 +08:00
daiao 4477223637 editorMD上传图片 2018-02-09 10:55:26 +08:00
daiao 691b59d856 数据描述使用editorMD 2018-02-09 10:35:28 +08:00
caishi a54226a5e7 附件样式 2018-02-09 10:20:37 +08:00
caishi 04a0ef03ac 附件 2018-02-09 10:12:47 +08:00
caishi 85a0e0808c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 10:08:24 +08:00
caishi 1c2cff658f textarea 2018-02-09 10:07:44 +08:00
daiao 59849472ab 编辑关卡时,上传附件 2018-02-09 10:07:34 +08:00
daiao 6f134f5f28 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 09:55:32 +08:00