Commit graph

25 commits

Author SHA1 Message Date
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin 423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Jure Grabnar 1c7a051551 Catch all errors on PIO import and show message 2018-11-23 20:47:48 +01:00
Oleksii Kriuchykhin a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
Zanz2 1606982966 found a hackish fix by doing a manual ajax call and some other things with jquery 2018-04-02 19:56:25 +02:00
Zanz2 367eff6401 re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches 2018-02-07 11:17:53 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
Zanz2 1d4ce42f23 fixed according to PR 2018-01-26 15:29:13 +01:00
Zanz2 fc541147c8 A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone 2018-01-25 15:54:38 +01:00
Zanz2 11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
Zanz2 4b837dbe9d Forgot flash fail messagges, now added them for file too big and general error 2017-11-09 10:49:44 +01:00
Zanz2 6fc1afe4c1 Trying to fix this messy table preview 2017-10-30 01:57:42 +01:00
Zanz2 9655c98566 Github review refactor 2017-10-07 20:47:05 +02:00
Zanz2 3074acbc0d Made javascript code nicer 2017-09-26 13:31:24 +02:00
Zanz2 dd4d4072e8 Made code more aesthetic 2017-09-22 16:02:56 +02:00
Zanz2 deef790951 added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions 2017-09-22 11:56:50 +02:00
Zanz2 ed64ce814a i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript 2017-09-19 16:07:54 +02:00
Zanz2 7aba782639 optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show 2017-09-19 15:02:16 +02:00
Zanz2 5d6cc341ed added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done 2017-09-14 14:42:04 +02:00
Zanz2 d6d1f9d490 changed second modal preview styling to fit its specifications 2017-09-14 11:46:41 +02:00
Zanz2 29b9d50363 Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer 2017-09-14 11:30:53 +02:00