Commit graph

22 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Urban Rotnik 6cf4717ab3 Add envirnoments to run app without docker, reorder Gemfile
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
2019-01-18 16:01:09 +01:00
Oleksii Kriuchykhin 32d00cb2b9 Make AWS access key variables optional [SCI-2727] 2018-11-28 10:41:05 +01:00
Oleksii Kriuchykhin 32536db171 Add subfolder option to S3 bucket config [SCI-2727] 2018-11-27 14:58:34 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin 8b11427780 Add allowed zip file type to Powerpoin and Word files [SCI-1916] 2018-01-11 15:17:30 +01:00
Oleksii Kriuchykhin fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Oleksii Kriuchykhin 58c2487eb6 Enable :preserve_files in paperclip config [SCI-1626] 2017-10-10 13:32:14 +02:00
Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin 036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
zmagod fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
Oleksii Kriuchykhin ba4dbe49f8 Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166] 2017-04-04 10:51:54 +02:00
Luka Murn 0916e7e40d Allow upload of .dot, .pot, .rtf files
Closes SCI-1052.
2017-03-06 15:01:32 +01:00
Matej Zrimšek 40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Matej Zrimšek f4d4977457 Removed header checking and added office file types grouping exceptions when checking file spoofing [fixes SCI-418] 2016-09-07 13:04:18 +02:00
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Matej Zrimšek 04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +02:00
Matej Zrimšek 27a9dac412 File permissions corrected, with some refactoring. 2016-08-17 18:23:24 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00