Commit graph

22 commits

Author SHA1 Message Date
zmagod e0e998a0d8 add smart annotation parser helper 2017-01-10 14:14:21 +01:00
zmagod 94262b56ef prepare data for atwho 2017-01-10 14:14:21 +01:00
Zmago Devetak 91f29745c4 Merge pull request #314 from ZmagoD/zd_SCI_643
adds autolink
2016-12-05 10:47:23 +01:00
zmagod 32eea3dbdd adds autolink to result comments 2016-11-23 14:24:51 +01:00
Luka Murn 595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Luka Murn a3bbf94643 Add a smart_text_area tag & implement it throughout application
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Luka Murn b42922d32c Add autosize functionality to all textareas
Closes SCI-637
2016-11-11 09:09:41 +01:00
Luka Murn 55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
Zmago Devetak f3708bcac0 Merge pull request #191 from ZmagoD/zd_SCI_469_ver2
Comments date duplication
2016-10-05 15:47:42 +02:00
mlorb 00b0f6ab07 Merge pull request #184 from mlorb/ml_sci_472
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
2016-10-03 17:20:45 +02:00
zmagod 36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Mojca Lorber 35477b1005 Remove Info tab and change comment title on results view 2016-09-29 16:43:19 +02:00
zmagod 2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
zmagod 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
Matej Zrimšek b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +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
Luka Murn 6d86a02d7c Add individual permission checks in dropdowns
Closes SCI-258.
2016-08-25 13:51:50 +02:00
Luka Murn 24dd25d9f5 Add edit/delete result comment functionality
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
scibb a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +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