Commit Graph

20 Commits

Author SHA1 Message Date
xiaoxiaoqiong 689a91ab49 Merge branch 'dev_military_server_local' into dev_jk_server
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/competition_infos_controller.rb
2022-04-11 17:41:03 +08:00
xiaoxiaoqiong 972373a277 上传图片去掉dun检测 2022-03-31 09:39:42 +08:00
xiaoxiaoqiong fc3344c78a fixed 项目中下载文件 2022-03-08 13:53:51 +08:00
yystopf 1bf858c10c fix: remove check image able 2022-03-01 17:59:23 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
yystopf cd569f4b8a fix: download url redirect delay 2021-09-10 15:53:38 +08:00
Jasder 0f01abd45f Merge branch 'develop' into dev_military 2021-01-28 15:21:43 +08:00
Jasder 458fca9992 fix change stoage file derictory 2021-01-28 15:11:47 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
sylor_huang@126.com 75c951c204 Change 2020-09-29 14:47:12 +08:00
sylor_huang@126.com f5c7792717 Add Download 2020-09-29 14:27:57 +08:00
sylor_huang@126.com d9f6750797 Add Attachment2 2020-09-25 10:26:51 +08:00
sylor_huang@126.com 1fcf540dfc Add Attachment 2020-09-25 09:49:42 +08:00
sylor_huang@126.com 95ede63220 Change 2020-08-19 17:58:04 +08:00
sylor_huang@126.com c9a263e03c Add Dun Check For Project 2020-08-18 10:36:13 +08:00
sylor_huang@126.com 3f7ef8cc0a 修改上传md上传附件的attachments_controller 2020-04-29 14:03:35 +08:00
sylor_huang@126.com 33c3ecb562 修改md编辑器上传图片的问题 2020-04-29 11:49:39 +08:00
sylor_huang@126.com 98a055db69 修改附件及搜索协作者的bug 2020-04-24 09:45:42 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00