jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,252 Commits 98 Branches 0 Tags 0 B
Commit Graph

15544 Commits

Author SHA1 Message Date
cxt 45321dd6fe 数据量的千分位显示、精确到一位小数 2018-05-10 17:25:00 +08:00
cxt 75349207a0 数据的新建和编辑的调整 2018-05-09 15:57:30 +08:00
cxt 9e7e22525e 数据的排序调整 2018-05-09 10:35:33 +08:00
cxt d3f2b616c1 数据的过滤 2018-05-09 09:49:00 +08:00
cxt 232c556fa8 调整 2018-05-08 16:48:07 +08:00
cxt cc008e3160 调整 2018-05-08 16:46:03 +08:00
cxt aa8050a913 调整 2018-05-08 16:43:09 +08:00
cxt f70f139699 调整 2018-05-08 16:42:33 +08:00
cxt 0fe00bce50 调整 2018-05-08 16:33:25 +08:00
cxt 2a8aad92d6 数据的调整 2018-05-08 16:25:59 +08:00
cxt 5dd5192822 数据模块的调整 2018-05-07 14:55:00 +08:00
cxt a082d7a8eb 数据模块的调整 2018-05-07 11:26:40 +08:00
huang b2654b006f yangshi 2018-05-06 14:44:14 +08:00
huang e197e7c024 输入框Mb样式调整 2018-05-06 14:32:31 +08:00
cxt 075091beda 数据增加数据源大小 2018-05-04 17:17:07 +08:00
daiao cb71a45efc 数据源大小 2018-05-04 15:38:05 +08:00
cxt 46df3c2d67 班级相关页面的优化 2018-03-23 15:54:50 +08:00
daiao ba73d7a30c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-03-22 16:54:58 +08:00
daiao 8d437eb539 课程代码优化 2018-03-22 16:53:14 +08:00
cxt dd69848e34 同一个人给的多个匿评评分请在一个区域按照时间倒序显示，现状让用户误以为被多个不同用户给匿评了 2018-03-22 14:58:40 +08:00
cxt 938b2501b6 从题库选用编程作业后，样例测试都丢掉了 2018-03-21 17:47:33 +08:00
cxt d095e7bf54 展开/收起评阅详情 2018-03-21 17:25:49 +08:00
cxt cb8148d8a0 别人对自己的评分记录没有显示，也没有选项可操作 2018-03-21 17:09:56 +08:00
cxt 5b03de8596 课程首页报500 2018-03-20 17:22:57 +08:00
cxt e9aa22cdee 班级作品列表评阅弹框中，增加“展开评阅详情”的复选项 2018-03-16 17:37:14 +08:00
cxt 2ea79057c9 课程下创建新班级，提供可选项选择是否继承原有资源等实现方法 2018-03-16 16:08:39 +08:00
cxt b8c916deb3 360浏览器操作更改单位名称，没有下拉选项 2018-03-16 09:19:51 +08:00
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
daiao 91dae5c4e9 数据页面赛选排序 2018-02-09 09:55:21 +08:00
caishi c8135e23c1 数据类别名称 2018-02-08 17:18:18 +08:00
daiao 1117805669 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 16:25:56 +08:00
daiao afe708eb86 数据首页筛选优化 2018-02-08 16:25:49 +08:00
huang 7f32f7f068 查询语句按attachments的size排序 2018-02-08 16:16:28 +08:00
daiao 75f9f867e8 新建数据使用editorMD 2018-02-08 16:05:29 +08:00
daiao 8bead9fecb 筛选问题 2018-02-08 15:37:30 +08:00
daiao d54020d32d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 15:12:46 +08:00
daiao 31a10a9945 数据首页分类完成 2018-02-08 15:12:36 +08:00
huang a7322ac90c 修复编辑在特殊情况下的一些问题 2018-02-08 15:10:53 +08:00
huang 462d910ece statistics编辑 2018-02-08 14:33:50 +08:00
huang 70894ace5e 新建statistics的一些问题修复 2018-02-08 11:31:31 +08:00
huang 2b73c4b338 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 11:25:00 +08:00
huang dc36435be5 编辑功能 2018-02-08 11:24:42 +08:00
daiao aed5823d3f 数据页面 2018-02-08 11:24:04 +08:00
huang cfb3b3184b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/_form.html.erb
 2018-02-08 10:30:05 +08:00
huang 89bc3c24ed 新建数据统计两级类型选择 2018-02-08 10:28:45 +08:00
caishi 2aa424f356 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/_form.html.erb
 2018-02-07 17:28:04 +08:00
caishi 4645bddd1c fdf 2018-02-07 17:26:09 +08:00
huang ae0e78664c 提交 2018-02-07 17:25:41 +08:00
huang 65e2433592 完成子类数据；主类数据功能 2018-02-07 16:19:16 +08:00
caishi 2bb713c7b9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2018-02-07 16:02:35 +08:00
caishi 9ed4637269 超级管理员新增编辑删除数据主类别和子类别 2018-02-07 16:02:04 +08:00