Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								5bda53eebf 
								
							 
						 
						
							
							
								
								Overall refactoring of all canaid permissions and code related to their calls.  
							
							
							
						 
						
							2018-02-16 10:54:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								8ef6c8f91f 
								
							 
						 
						
							
							
								
								Refactored remaining experiment level permissions (and everything below it).  
							
							
							
						 
						
							2018-02-14 14:39:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								d6e7ef465c 
								
							 
						 
						
							
							
								
								Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]  
							
							
							
						 
						
							2018-02-14 14:19:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								7dd9121072 
								
							 
						 
						
							
							
								
								Actually return 404 when requested asset doesn't exist [SCI-1994]  
							
							
							
						 
						
							2018-01-25 14:30:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mlorb 
								
							 
						 
						
							
							
							
							
								
							
							
								806fcbce36 
								
							 
						 
						
							
							
								
								refactor update protocol in repository permission  
							
							
							
						 
						
							2017-12-14 14:18:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mlorb 
								
							 
						 
						
							
							
							
							
								
							
							
								e0d1ae174e 
								
							 
						 
						
							
							
								
								refactor read protocol in repository permission  
							
							
							
						 
						
							2017-12-14 14:18:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mlorb 
								
							 
						 
						
							
							
							
							
								
							
							
								a3a494c3a2 
								
							 
						 
						
							
							
								
								fix banana: remove dead code which strangely reappeared, probably with some rebasing  
							
							
							
						 
						
							2017-12-14 14:18:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								5cc6cd094e 
								
							 
						 
						
							
							
								
								refactor  
							
							
							
						 
						
							2017-03-17 16:47:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								7b16e5643e 
								
							 
						 
						
							
							
								
								fix assets preprocesor for wopi files  
							
							
							
						 
						
							2017-03-13 13:20:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2523beca 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/biosistemika/scinote-web  into office_integration  
							
							
							
						 
						
							2017-03-10 16:21:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								89710d8782 
								
							 
						 
						
							
							
								
								Enable image preview for newly uploaded images [SCI-694]  
							
							
							
						 
						
							2017-01-06 16:41:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								aa2b573278 
								
							 
						 
						
							
							
								
								Enable image preview while editing steps and code style improvements [SCI-694]  
							
							
							
						 
						
							2017-01-06 15:58:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								a434649f42 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/biosistemika/scinote-web  into office_integration  
							
							
							
						 
						
							2017-01-03 16:35:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								e554fdf805 
								
							 
						 
						
							
							
								
								code refactor  
							
							
							
						 
						
							2016-12-21 16:52:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								00ea3a027c 
								
							 
						 
						
							
							
								
								Fix generation of preview url for new steps and results [SCI-694]  
							
							
							
						 
						
							2016-12-20 16:10:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								cbef971d85 
								
							 
						 
						
							
							
								
								Fix timeouts when fetching images from S3 [SCI-694]  
							
							
							
						 
						
							2016-12-20 15:36:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								d2b76d8385 
								
							 
						 
						
							
							
								
								Improved image preview modal [SCI-694]  
							
							
							
						 
						
							2016-12-19 17:36:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								de3099e4d1 
								
							 
						 
						
							
							
								
								removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository  
							
							
							
						 
						
							2016-12-09 13:59:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								40fdfef67f 
								
							 
						 
						
							
							
								
								setup delayed_paperclip gem  
							
							
							
						 
						
							2016-12-08 15:24:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zmagod 
								
							 
						 
						
							
							
							
							
								
							
							
								ac52e643be 
								
							 
						 
						
							
							
								
								cleanup direct upload  
							
							
							
						 
						
							2016-12-08 11:26:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nejc Bernot 
								
							 
						 
						
							
							
							
							
								
							
							
								cb03ed8384 
								
							 
						 
						
							
							
								
								Users can now have multiple tokens  
							
							... 
							
							
							
							A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables. 
							
						 
						
							2016-11-30 16:48:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								cc0aab2e59 
								
							 
						 
						
							
							
								
								Improve regexp for image whitelisting [SCI-736]  
							
							
							
						 
						
							2016-11-28 10:08:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oleksii Kriuchykhin 
								
							 
						 
						
							
							
							
							
								
							
							
								74f6455a8f 
								
							 
						 
						
							
							
								
								Add whitelisting of supported image types [SCI-736]  
							
							
							
						 
						
							2016-11-25 16:12:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								0780bd2416 
								
							 
						 
						
							
							
								
								Ruby constants are now automatically available in JS. Refactoring was needed.  
							
							
							
						 
						
							2016-10-17 11:57:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								3e74c96085 
								
							 
						 
						
							
							
								
								Add wd* params to iframe action url  
							
							
							
						 
						
							2016-10-04 18:00:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								72c5824e67 
								
							 
						 
						
							
							
								
								Remove navbar for viewing WOPI files  
							
							
							
						 
						
							2016-10-03 20:02:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								ff47f29dc2 
								
							 
						 
						
							
							
								
								Add wopi file activity  
							
							... 
							
							
							
							SCI-393 #close 
							
						 
						
							2016-09-29 16:16:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								ed8df3cc62 
								
							 
						 
						
							
							
								
								Add favicon url to iframe  
							
							
							
						 
						
							2016-09-29 12:19:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								e96e8486ea 
								
							 
						 
						
							
							
								
								Add check file permissions to assets controller  
							
							... 
							
							
							
							SCI-502 #close 
							
						 
						
							2016-09-28 09:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jure Grabnar 
								
							 
						 
						
							
							
							
							
								
							
							
								5aea0fbb19 
								
							 
						 
						
							
							
								
								Refactor the rest of WOPI logic from Nejc  
							
							
							
						 
						
							2016-09-28 09:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nejc Bernot 
								
							 
						 
						
							
							
							
							
								
							
							
								1b260785ec 
								
							 
						 
						
							
							
								
								First working version of office integration  
							
							... 
							
							
							
							Only works on scinote-preview 
							
						 
						
							2016-09-28 09:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								c2f0106993 
								
							 
						 
						
							
							
								
								Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]  
							
							
							
						 
						
							2016-09-16 15:56:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								76ff34a8a9 
								
							 
						 
						
							
							
								
								URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring.  
							
							
							
						 
						
							2016-09-13 18:56:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								04d9163ff6 
								
							 
						 
						
							
							
								
								Paperclip file spoofing corrected/modified.  
							
							
							
						 
						
							2016-08-25 18:57:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad384df5a 
								
							 
						 
						
							
							
								
								Fixed hound alerts.  
							
							
							
						 
						
							2016-08-17 21:02:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								27a9dac412 
								
							 
						 
						
							
							
								
								File permissions corrected, with some refactoring.  
							
							
							
						 
						
							2016-08-17 18:23:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								e4a6a3944e 
								
							 
						 
						
							
							
								
								Added deleting of files on S3 server when editing/removing a file. Some refactoring.  
							
							
							
						 
						
							2016-08-17 18:13:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								ccdccc5cf1 
								
							 
						 
						
							
							
								
								Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.  
							
							
							
						 
						
							2016-08-17 18:11:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								854ef0d227 
								
							 
						 
						
							
							
								
								Special characters caused error [fixes SCI-315].  
							
							
							
						 
						
							2016-08-17 18:10:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								c87ba5b45c 
								
							 
						 
						
							
							
								
								Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.  
							
							
							
						 
						
							2016-08-17 18:10:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matej Zrimšek 
								
							 
						 
						
							
							
							
							
								
							
							
								951cf67b3d 
								
							 
						 
						
							
							
								
								A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.  
							
							
							
						 
						
							2016-08-17 18:08:21 +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