16 commits

Author	SHA1	Message	Date
Luka Murn	77f00bf3a7	Bump version to 1.2.2	2016-09-01 11:34:28 +02:00
Luka Murn	9ceea255b2	Bump version to 1.2.1	2016-08-31 14:29:27 +02:00
Luka Murn	ae9959dc3c	Bump version to 1.2.0	2016-08-31 11:22:03 +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
Zmago Devetak	0cfc758f43	Merge pull request #102 from ZmagoD/zd_SCI_336 ... implement first time popup logic	2016-08-26 09:19:36 +02:00
Matej Zrimšek	04d9163ff6	Paperclip file spoofing corrected/modified.	2016-08-25 18:57:06 +02:00
Luka Murn	15c0baeee8	Add delete project comment functionality ... This commit also removes the old code from @bberic.	2016-08-25 13:51:30 +02:00
zmagod	5fabe06b8d	implement first time popup logic	2016-08-25 11:44:49 +02:00
zmagod	cac5033eba	set ajax for workflow img	2016-08-19 15:36:12 +02:00
Matej Zrimšek	27a9dac412	File permissions corrected, with some refactoring.	2016-08-17 18:23:24 +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
Jure Grabnar	555ed05ae6	Refactor/DRY dropdown actions code for experiment	2016-08-12 10:18:35 +02:00
zmagod	a4ec558596	start to implement project overview page	2016-08-04 12:57:33 +02:00
zmagod	352944fc33	added new/edit experiment modals	2016-07-28 14:44:44 +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