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

19316 Commits

Author SHA1 Message Date
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
huang 405b362470 数据子类别与数据主类别的一些修改 2018-02-07 16:01:14 +08:00
caishi 617970ddd2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2018-02-07 14:16:11 +08:00
caishi fb5e59093a x 2018-02-07 14:14:31 +08:00
huang a25dc9d6ce 数据子类（增删查改）；数据主类（增删查该） 2018-02-07 14:13:09 +08:00
caishi a38c68a791 数据新建和列表 2018-02-06 17:41:39 +08:00
huang be49ca8930 Merge branch 'dev_statistic' into develop 2018-02-05 15:53:00 +08:00
huang 0db396175b 数据统计添加附件功能 2018-02-05 15:13:03 +08:00
huang 11dfd8dbb2 数据统计功能（增删查改） 2018-02-05 12:03:35 +08:00
cxt f9a507ec11 分组作业成绩导出 2018-01-11 09:35:29 +08:00
cxt 346d050736 分组作业成绩导出 2018-01-11 09:26:21 +08:00
cxt 55fd9e6adb footer修改 2018-01-09 09:39:55 +08:00
cxt 83d29253dc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-01-08 13:50:52 +08:00
cxt ba9ce24735 footer修改 2018-01-08 13:49:51 +08:00
huang a7c57c5b52 作业导入 2017-11-12 15:42:37 +08:00
huang 00e250f1b8 导入作业 2017-11-12 14:44:20 +08:00
huang 353b9ac670 excel导入功能 2017-11-12 11:30:00 +08:00