scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-29 11:26:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
6252 commits 69 branches 179 tags 165 MiB
Commit graph

4859 commits

Author SHA1 Message Date
Oleksii Kriuchykhin d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +02:00
Mojca Lorber b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00
Oleksii Kriuchykhin 882c12cd31 Remove protocol description from preview popup [SCI-3485] 2019-05-20 15:04:54 +02:00
Oleksii Kriuchykhin 1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
aignatov-bio b22dba7f05
Add delay job for handling unknown tinyMCE images (#1781) 
* Add delay job for handling unknown tinyMCE images
 2019-05-20 12:44:16 +02:00
aignatov-bio d959769b65
Fix experiment and step title (#1779) 2019-05-20 11:20:08 +02:00
aignatov-bio 20b626d791
Fix warning message issue in step description [SCI-3479] (#1778) 
* Fix warning message issue
 2019-05-20 11:19:53 +02:00
Luka Murn 4136aa0575 Add a startup check for WOPI_ENABLED == true variables 2019-05-18 10:22:53 +02:00
Luka Murn c26489acdc Update protocol status bar upon changing of protocol description 2019-05-17 10:22:16 +02:00
Alex Kriuchykhin df59c54bd4
Merge pull request #1776 from okriuchykhin/ok_SCI_3477 
Fix protocol metadata editing in repository [SCI-3477]
 2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin 488fc99dae Fix protocol metadata editing in repository [SCI-3477] 2019-05-16 17:11:17 +02:00
Luka Murn 8aa702a4bf Fix bug with external TinyMCE assets 2019-05-16 13:33:04 +02:00
Anton Ignatov dcb6162ded Fix merge error 2019-05-16 09:40:02 +02:00
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Alex Kriuchykhin bcbaf73669
Merge pull request #1773 from okriuchykhin/ok_SCI_3468 
Add permission checking to inline editor fields [SCI-3468]
 2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin 2ef926e795 Add permission checking to inline editor fields [SCI-3468] 2019-05-15 17:47:09 +02:00
aignatov-bio 980d86824f
Fix updating process for old tinyMCE tags (#1772) 
* Fix update old tinyMCE for deleted objects

* Add error handling
 2019-05-15 16:11:48 +02:00
Alex Kriuchykhin 607356ce1b
Merge pull request #1771 from okriuchykhin/ok_SCI_3466 
Show task due date in UTC [SCI-3466]
 2019-05-15 15:30:17 +02:00
Oleksii Kriuchykhin 71a4a1348a Show task due date in UTC [SCI-3466] 2019-05-15 15:17:44 +02:00
aignatov-bio 24e30867da
Add smart annotation to comments [SCI-3458] (#1768) 
* Add smart annotation to comments
 2019-05-15 14:59:15 +02:00
aignatov-bio f1f04adeb2
Fix placeholder in protocol description [SCI-3454] (#1769) 
* Fix placeholder in protocol description

* Change task tags text
 2019-05-15 14:13:13 +02:00
Alex Kriuchykhin ae456a6408
Merge pull request #1770 from okriuchykhin/ok_SCI_3376 
Force UTF-8 encoding for Table contents in API [SCI-3376]
 2019-05-15 13:56:01 +02:00
Alex Kriuchykhin d12723f7c2
Merge pull request #1767 from okriuchykhin/ok_SCI_2841 
Improve handling of CSRF token errors [SCI-2841]
 2019-05-15 13:48:19 +02:00
Oleksii Kriuchykhin 94953b03c8 Force UTF-8 encoding for Table contents in API [SCI-3376] 2019-05-15 13:12:54 +02:00
Oleksii Kriuchykhin 5b0e9872c3 Improve handling of CSRF token errors [SCI-2841] 2019-05-14 17:02:56 +02:00
Miha Mencin 13d126bc39
Merge pull request #1761 from mlorb/ml-sci-3456 
Fix broken global activities team filter [SCI-3456]
 2019-05-14 16:36:44 +02:00
aignatov-bio 825e34e661
Fix inside click action in inline editing [SCI-3440] (#1765) 
* Fix inside click action
 2019-05-14 16:25:46 +02:00
aignatov-bio d28d466dc9
Fix multiple confirm windows [SCI-3452] (#1763) 
* Fix multiple confirm windows
 2019-05-14 16:25:34 +02:00
aignatov-bio 4a753f8519
Fix user smart annotation fpr tinyMCE (#1759) 2019-05-14 15:02:12 +02:00
aignatov-bio 1555daa0c6
Fix non associated tinyMCE images (#1762) 
* Fix non assosiated tinyMCE images
 2019-05-14 15:01:57 +02:00
Mojca Lorber 54f735551c Fix broken global activities team filter 2019-05-14 13:50:10 +02:00
Oleksii Kriuchykhin 65fb4b1372 Fix processing_image_url for S3 storage [SCI-3381] 2019-05-14 12:53:35 +02:00
aignatov-bio fe2a3c4ee6
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754) 
* Add message when turbolinks change page with dirty tinuMCE
 2019-05-14 09:49:00 +02:00
aignatov-bio f970eea525
Some gui fixes (#1757) 2019-05-14 09:43:02 +02:00
Alex Kriuchykhin e544edeaf7
Merge pull request #1758 from okriuchykhin/ok_SCI_3381 
Fix handling of processing step attachments [SCI-3381]
 2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin 4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +02:00
Luka Murn 40ab883369
Merge pull request #1756 from Ducz0r/lm-sci-3426-fix-2 
Refactor WOPI filename length validation onto the model [SCI-3426]
 2019-05-13 16:12:55 +02:00
Luka Murn bd9ffe4bd2 Refactor WOPI filename length validation onto the model 2019-05-13 15:41:39 +02:00
Mojca Lorber 5c847d5b5d Change author of copied inventory item 2019-05-13 15:37:36 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
aignatov-bio 039b2f3754
Fix zoom on Y axis [SCI-3374] (#1750) 
* Add zoom to image annotation
 2019-05-13 11:01:39 +02:00
Miha Mencin 765c6ebd6a
Merge pull request #1747 from biosistemika/lm-sci-3438-fix 
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
 2019-05-13 10:56:30 +02:00
Miha Mencin 5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426 
Changes to create new office file button [SCI-3426]
 2019-05-13 10:55:58 +02:00
aignatov-bio d3aa6371cd
Fix report saving [SCI-3443] (#1753) 
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
 2019-05-13 10:55:08 +02:00
aignatov-bio da5b24ef57
Fix attachment appearence after update (#1745) 2019-05-13 10:54:16 +02:00
Alex Kriuchykhin 837e5d1fea
Merge pull request #1744 from okriuchykhin/ok_SCI_3439 
Change implementation of TinyMCE floating toolbar [SCI-3439]
 2019-05-13 10:46:23 +02:00
aignatov-bio 71b3228310
Update protocol preview style [SCI-3416] (#1729) 
* Update protocol appearance
 2019-05-13 10:45:12 +02:00
Oleksii Kriuchykhin b60bd79e2b Change implementation of TinyMCE floating toolbar [SCI-3439] 2019-05-13 10:26:15 +02:00
aignatov-bio 3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00
aignatov-bio 364f903b3c
Fix protocol preview name (#1749) 2019-05-13 10:17:47 +02:00
aignatov-bio 2010b3ad8f
Fix step comments bugs (#1751) 2019-05-13 09:49:53 +02:00
aignatov-bio 0b194eb3b1
Revert "Fix report saving (#1748)" (#1752) 
This reverts commit 3db6129808.
 2019-05-13 09:09:36 +02:00
aignatov-bio 3db6129808
Fix report saving (#1748) 2019-05-13 08:58:47 +02:00
Anton Ignatov 65eff67926 Fix merge 2019-05-11 20:54:52 +02:00
Anton Ignatov e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +02:00
aignatov-bio 634b58bd6a
Various UX improvements for note section [SCI-3444] (#1742) 
* Various UX improvments for note section
 2019-05-11 16:04:28 +02:00
Luka Murn 059ebf6f27 Fix task and protocol description (TinyMCE) rendering on task page 
Closes SCI-3438.
 2019-05-10 20:39:26 +02:00
Luka Murn bbfad0efe5 Refresh current page after new OfficeOnline file is created 2019-05-10 18:30:48 +02:00
Luka Murn 890df8803e Add file name validation to create new Office file modal window 2019-05-10 18:19:32 +02:00
Luka Murn 584cf4b93b Change Office icon on the create New Office buttons 2019-05-10 17:51:29 +02:00
mlorb 110c4ec460
Merge pull request #1743 from mlorb/ml-sci-3386 
Fix tiny mce visuals, saving and cursor position [SCI-3386]
 2019-05-10 17:45:12 +02:00
Luka Murn 5135922254 Move the WOPI controls partial to /wopi folder, fix typo 2019-05-10 16:51:54 +02:00
Luka Murn b78caef915 Fix the file preview modal so it supports WOPI_ENABLED == false 2019-05-10 16:41:11 +02:00
aignatov-bio f684ddd365
Change dropdown highlight color and fix task tag position [SCI-3410] (#1735) 
* Change dropdown highlight color and fix task tag position
 2019-05-10 16:37:59 +02:00
Mojca Lorber 86255b9037 Remove automatic saving on task and protocol description 2019-05-10 15:30:29 +02:00
aignatov-bio bbf54de9c7
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support 
Add old tinymce image support [SCI-3423]
 2019-05-10 15:27:42 +02:00
Mojca Lorber d761a5cecb Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description 2019-05-10 11:27:47 +02:00
Mojca Lorber 8e6413b031 Fix tiny mce visuals, saving and cursor position 2019-05-10 10:52:14 +02:00
aignatov-bio 3bb268459f
Merge pull request #1739 from aignatov-bio/ai-sci-3425-add-smart-annotation-to-protocol-description 
Fix smart annotation in protocols in repository [SCI-3425]
 2019-05-09 15:36:42 +02:00
Alex Kriuchykhin 2a7f70929a
Merge pull request #1717 from okriuchykhin/ok_SCI_3368 
Improve clean up of Export All files [SCI-3368]
 2019-05-09 13:37:56 +02:00
Anton Ignatov 2e6bab4638 Fix smart anottation to protocols in repository 2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin 40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Anton Ignatov 995408e7fc Fix protocol update error, rollback bootstrap gems and fix step name 2019-05-08 17:18:19 +02:00
Anton Ignatov bee87f51ba Fix tests 2019-05-08 15:22:06 +02:00
Anton Ignatov b5271bdd2c Add remote api support 2019-05-08 15:00:36 +02:00
Anton Ignatov 5a5101410c Fix markup 2019-05-08 14:35:28 +02:00
Anton Ignatov b2063d3018 Fix markup 2019-05-08 14:30:33 +02:00
Anton Ignatov f201c5440b Add check for old tinymce for report and reassign process 2019-05-08 14:29:25 +02:00
Anton Ignatov 5d959f648e Convert old tinymce assets to new on fly 2019-05-08 14:23:26 +02:00
Anton Ignatov dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
aignatov-bio d08bdd771e
Fix task tag cut off (#1734) 2019-05-08 10:21:59 +02:00
Urban Rotnik 62bc0520e9 Update method last_sync_timestamp from Last to First user 2019-05-08 08:38:11 +02:00
Urban Rotnik 2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Urban Rotnik 357c6e6b98 Change ordering by created_at instead by last_time_changed_at 2019-05-08 08:37:34 +02:00
Alex Kriuchykhin 66a563e032
Merge pull request #1733 from okriuchykhin/ok_SCI_3351 
Fix deletion of unconfirmed users [SCI-3351]
 2019-05-07 16:43:05 +02:00
Miha Mencin 0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading 
Clear step edit textarea status before going to edit mode [SCI-3413]
 2019-05-07 16:36:04 +02:00
Miha Mencin b31645adbe
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce 
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
 2019-05-07 16:35:49 +02:00
Miha Mencin 60fd1a02c6
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter 
Add task tag on enter button [SCI-3410]
 2019-05-07 16:35:34 +02:00
Miha Mencin e660b64261
Merge pull request #1728 from aignatov-bio/ai-sci-3262-update-export-import-scripts 
Update team exporter for new tinyMCE images [SCI-3262]
 2019-05-07 16:35:23 +02:00
Miha Mencin 4b76151e40
Merge pull request #1727 from mlorb/ml-sci-3384 
Fix bug when saving empty step description [SCI-3384]
 2019-05-07 16:35:12 +02:00
Miha Mencin 7c088c8432
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line 
Fix due date position [SCI-3411]
 2019-05-07 16:34:23 +02:00
Miha Mencin 7760e9611f
Merge pull request #1726 from aignatov-bio/ai-sci-3409-fix-icon-for-uncomplete-task 
Fix button icon for uncomplete task [SCI-3409]
 2019-05-07 16:34:00 +02:00
Oleksii Kriuchykhin 8461949bed Fix deletion of inconfirmed users [SCI-3351] 2019-05-07 16:02:45 +02:00
Anton Ignatov ea545801aa Clear edit textarea status before going to editmode 2019-05-07 15:54:32 +02:00
Anton Ignatov 826ed63f17 Fix floating tool bar and scroll issue after leaving editor 2019-05-07 15:21:15 +02:00
Anton Ignatov 168424a035 Add tag on enter button 2019-05-07 14:47:44 +02:00
Anton Ignatov d36160386f Merge branch 'master' into master-with-note-section 2019-05-07 13:26:55 +02:00
Anton Ignatov 7f296b35fa Update team exporter for new tinymce images 2019-05-07 13:22:55 +02:00
aignatov-bio 7d54f2ab01
Fix issue with TInyMCE upload plugin (#1723) 2019-05-07 10:24:02 +02:00
Mojca Lorber 46e8f80965 Fix bug when saving empty step description 2019-05-06 17:14:19 +02:00
Anton Ignatov 0e1e7c3d82 Fix button icon for uncomplete task 2019-05-06 16:35:46 +02:00
Anton Ignatov 2d4f4ec8f8 Merge branch 'master-with-note-section' into ai-sci-3411-due-date-in-one-line 2019-05-06 16:22:34 +02:00
Anton Ignatov 2a294c408f Fix due date alignment and chage header structure from bootstrap to flexbox 2019-05-06 16:20:00 +02:00
aignatov-bio 4c1a64ce4f
Fix tags line up (#1722) 2019-05-06 14:19:32 +02:00
Jure Grabnar c866d96ea7
Merge pull request #1720 from jbargu/jg_sci_3375 
One project is duplicated in project list [SCI-3375]
 2019-05-06 11:43:24 +02:00
Alex Kriuchykhin 3f0401bf9a
Merge pull request #1709 from okriuchykhin/ok_SCI_3398 
Fix TinyMCE for results [SCI-3398]
 2019-05-06 10:47:11 +02:00
mlorb df16b54be0
Merge pull request #1719 from mlorb/ml-sci-3399 
Visual fixes for edit/add step on protocol [SCI-3399]
 2019-05-06 10:33:28 +02:00
aignatov-bio cc8a152278
Fix step attachments sorting (#1718) 2019-05-06 09:56:26 +02:00
Anton Ignatov 565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +02:00
Anton Ignatov 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-02 16:16:03 +02:00
Anton Ignatov fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov f73dd38780 Add image editor to tinymce drawings 2019-04-30 18:32:59 +02:00
Anton Ignatov 4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
Oleksii Kriuchykhin 4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +02:00
Jure Grabnar de6509cc97 Add distinct to #visible_to in project.rb 
Closes SCI-3375
 2019-04-30 16:40:12 +02:00
Mojca Lorber 7be151bd2d Visual fixes for edit/add step on protocol 2019-04-30 14:57:50 +02:00
aignatov-bio 60296419e8
Update project card due date dropdown (#1716) 2019-04-30 13:30:09 +02:00
Anton Ignatov 7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
mlorb 9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350 
Change ownership of inventory items, when a user leaves a team [SCI-3350]
 2019-04-30 10:39:14 +02:00
aignatov-bio 26dc1a0a4a
Note section css issues [SCI-3378] (#1715) 
* Fix step name width bug
 2019-04-30 10:23:44 +02:00
aignatov-bio 687b53feb1
Add new tag activtiies [SCI-3341] (#1712) 
* Add new tag activtiies
 2019-04-30 10:23:09 +02:00
Jure Grabnar b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380 
Add editnew action for editing new office files [SCI-3380]
 2019-04-30 09:57:07 +02:00
Jure Grabnar ed003aca13 Add editnew action for editing new office files 
Closes SCI-3380
 2019-04-30 08:19:52 +02:00
Oleksii Kriuchykhin 1b792e2b7e Improve clean up of Export All files [SCI-3368] 2019-04-30 00:43:34 +02:00
aignatov-bio 7d197a6f02
Remove gray step headers (#1713) 2019-04-29 14:06:55 +02:00
Mojca Lorber 5fd4c47388 Move change owner functionality to RepositoryRow 2019-04-29 14:02:02 +02:00
Miha Mencin a16b2cdf03
Merge pull request #1704 from urbanrotnik/ur-sci-3388-icon-for-deleting-is-visible 
Hide icon for deleting [SCI-3388]
 2019-04-29 10:15:18 +02:00
Anton Ignatov f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov 2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov 260810fff8 Add editing mode for tinymce images 2019-04-28 16:16:31 +02:00
Anton Ignatov 193edfbc35 Add marvin js support to TinyMCE 2019-04-27 22:54:59 +02:00
Anton Ignatov 54731856f0 Finish step chemical attachments 2019-04-27 19:08:40 +02:00
Anton Ignatov cf4ff41ec6 Add delete feature 2019-04-27 13:51:35 +02:00
Anton Ignatov 46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov baa9b94a63 Add new graph button to step 2019-04-26 20:33:20 +02:00
Anton Ignatov 40c1c9aef7 Add marvin js modal 2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin 077ad52d4b Fix TinyMCE for results [SCI-3398] 2019-04-26 17:37:01 +02:00
Miha Mencin 970a9b42ed
Update hilightjs github theme path 2019-04-26 17:29:14 +02:00
Urban Rotnik dba1ccfc34
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons 
Show icons for office files [SCI-3387]
 2019-04-26 15:53:53 +02:00
Urban Rotnik 3b063348ce Hide remove icon and show only on attachment hover 2019-04-26 15:51:35 +02:00
Urban Rotnik 090df87f48
Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button 
Remove duplicated button [SCI-3382]
 2019-04-26 15:46:57 +02:00
Urban Rotnik 88050b9b93
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable 
Fix for inline editing on Firefox [SCI-3383]
 2019-04-26 15:46:37 +02:00
Alex Kriuchykhin c735607930
Merge pull request #1701 from okriuchykhin/ok_SCI_3391 
Fix sorting by user name with search parameter in inventories [SCI-3391]
 2019-04-26 15:39:48 +02:00
Alex Kriuchykhin 5d85ac0a95
Merge pull request #1702 from okriuchykhin/ok_SCI_3390 
Fix loading more activities on task page [SCI-3390]
 2019-04-26 15:39:31 +02:00
aignatov-bio dc7fddc60a
Improve task tags (#1708) 2019-04-26 15:38:33 +02:00
aignatov-bio 9fbfa9215e
Add zoom to image annotation [SCI-3374] (#1694) 
* Add zoom to image annotation
 2019-04-26 15:21:01 +02:00
mlorb 12564bd070
Merge pull request #1686 from mlorb/ml-sci-3324 
Add activity for importing inventory items [SCI-3324]
 2019-04-26 15:20:40 +02:00
aignatov-bio 57b80280dc
Update attachemnts css (#1700) 2019-04-26 15:20:39 +02:00
Urban Rotnik 8413ed5ab0 Fix for inline editing on Firefox 2019-04-26 14:22:18 +02:00
Mojca Lorber 9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +02:00
Mojca Lorber eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
Urban Rotnik c41413234c Use MS office icons for MS files 2019-04-26 09:29:39 +02:00
Urban Rotnik c94d3ce950 Remove duplicated button 2019-04-26 07:57:46 +02:00
Alex Kriuchykhin 6bb19ed0be
Merge pull request #1697 from okriuchykhin/ok_SCI_3264 
Update limits for new rich text enabled fileds [SCI-3264]
 2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin 66631ba26c Fix loading more activities on task page [SCI-3390] 2019-04-25 23:50:00 +02:00
Oleksii Kriuchykhin 3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +02:00
aignatov-bio 1a860037f7
Update reports for new RTE [SCI-3263] (#1691) 
* Update reports for new RTE
 2019-04-25 16:16:43 +02:00
Urban Rotnik 0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes 
Comments section changes [SCI-3135]
 2019-04-25 14:18:05 +02:00
Anton Ignatov 0779ed598b Reuse inline editing logic 2019-04-25 11:14:55 +02:00
Anton Ignatov e52b985e7b xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes 2019-04-24 13:40:41 +02:00
Oleksii Kriuchykhin a3f5974dbd Update limits for new rich text enabled fileds [SCI-3264] 2019-04-24 13:37:22 +02:00
aignatov-bio 84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689) 
* Update protocol repository for new description format

* move image clone method to concerns
 2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin 88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Oleksii Kriuchykhin 7c91b4a255 Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266 2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +02:00
Urban Rotnik f894bca694 Add saving event when user clicks out of textarea 2019-04-23 15:02:59 +02:00
Urban Rotnik 774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Urban Rotnik 7a2bfc12ce Remove form_asset partial 2019-04-23 13:50:48 +02:00
Urban Rotnik b1dabaca15 New helper for file thumbnails 2019-04-23 13:50:48 +02:00
Urban Rotnik ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Jure Grabnar 1da1558849
Merge pull request #1683 from jbargu/jg_3179 
Archived results are now separated in exported project
 2019-04-19 18:26:22 +02:00
aignatov-bio 6968060078
Fix user order bug (#1687) 2019-04-19 15:24:13 +02:00
aignatov-bio 92d8e42a92
Add floating toolbar for tinymce (#1688) 2019-04-19 15:12:06 +02:00
aignatov-bio ba1e3dc3c6
Add smooth loading for inline task and protoocl description editing (#1682) 2019-04-19 14:47:05 +02:00
aignatov-bio 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
aignatov-bio a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Anton Ignatov f1d801117d disable zoom 2019-04-18 09:11:27 +02:00
Alex Kriuchykhin 8fa6bbc0ab
Merge pull request #1679 from okriuchykhin/ok_SCI_3177 
Improve experiment preview image generation [SCI-3177]
 2019-04-17 20:35:29 +02:00
Anton Ignatov f6ecea42cf Remove minimum zoom size 2019-04-17 18:51:52 +02:00
Jure Grabnar 1295c0583a Archived results are now separated in exported project 
Closes SCI-3179
 2019-04-17 16:37:21 +02:00
Alex Kriuchykhin b4cf665c21
Merge pull request #1673 from okriuchykhin/ok_SCI_3294 
Fix team export/import for new activities [SCI-3294]
 2019-04-17 12:49:45 +02:00
Oleksii Kriuchykhin f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Urban Rotnik 3f037ef517 Fix navigationJS team switch when have only 1 team 2019-04-17 09:58:18 +02:00
Urban Rotnik 782d1dfc2d
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2 
Exports left after export [SCI-3345]
 2019-04-16 14:44:48 +02:00
Urban Rotnik 4f8faba84e Exports left after export fix 2019-04-16 14:21:47 +02:00
Urban Rotnik 0ba0dccd57
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix 
Fix for exports_left, fix for some edge cases [SCI-3345]
 2019-04-16 10:32:31 +02:00
Urban Rotnik 22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Oleksii Kriuchykhin 2320941b5d Fix team export/import for new activities [SCI-3294] 2019-04-15 15:13:10 +02:00
mlorb 1e3d0e901a
Merge pull request #1667 from mlorb/ml-sci-3304 
Fix links in activity message for protocols in repository [SCI-3304]
 2019-04-15 11:55:08 +02:00
aignatov-bio 4fec72bc46
Merge pull request #1671 from aignatov-bio/ai-sci-3319-duplicate-activity-wronglink 
Fix duplicate activity issue and fix link to inventory [SCI-3319]
 2019-04-15 11:51:09 +02:00
Urban Rotnik 7eeba0e57e
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix 
Dynamic filtering default fix [SCI-3343]
 2019-04-15 11:40:16 +02:00
Anton Ignatov dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
Urban Rotnik 83f2a5c961 Dynamic filtering default fix 2019-04-15 11:20:43 +02:00
Alex Kriuchykhin a61d637e6d
Merge pull request #1669 from okriuchykhin/ok_SCI_3340 
Fix crash when no activities present [SCI-3340]
 2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin a43e42fdb3 Fix crash when no activities present [SCI-3340] 2019-04-15 10:51:59 +02:00
aignatov-bio 063f02dc56
Add ability to select filters with keyboard [SCI-3200] (#1649) 
* Add ability to select fitlers with keyboard
 2019-04-15 10:30:08 +02:00
aignatov-bio 8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
Alex Kriuchykhin 3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin 231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Mojca Lorber 252fdaf9a8 Fix links in activity message for protocols in repository 2019-04-12 15:14:41 +02:00
mlorb 538b48cb06
Merge pull request #1666 from mlorb/ml-sci-3331 
Rename button load more system notification to fix the bug [SCI-3331]
 2019-04-12 13:24:16 +02:00
Jure Grabnar be90881849
Merge pull request #1665 from jbargu/jg_sci_2949_3318 
Disable editing of office file in view mode when module is locked [SCI-2949, 3318]
 2019-04-12 13:00:18 +02:00
Mojca Lorber bf2e9e8194 Rename button load more system notification to fix the bug 2019-04-12 11:58:47 +02:00
mlorb 3c0b1984d0
Merge pull request #1658 from mlorb/ml-sci-3297 
Fix activity card visuals [SCI-3297]
 2019-04-12 09:20:11 +02:00
aignatov-bio 8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +02:00
aignatov-bio ffb0db06b9
Add scroll to team selector (#1659) 2019-04-12 09:17:14 +02:00
aignatov-bio 2b92a987e6
Fix user counter bug on project card (#1662) 2019-04-12 09:17:03 +02:00
mlorb 520738025a
Merge branch 'master' into ml-sci-3297 2019-04-12 08:32:07 +02:00
Jure Grabnar 1e5721ce95 Disable editing of office file in view mode when module is locked 
Closes SCI-2949
 2019-04-11 17:21:07 +02:00
Alex Kriuchykhin 7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292 
Improve global activities pagination and fetching [SCI-3292]
 2019-04-11 16:23:37 +02:00
Jure Grabnar eb6de67cb7
Merge pull request #1660 from jbargu/jg_sci_3302 
Date activity filter filters out activity after reaching bottom of the page [SCI-3302]
 2019-04-11 10:46:53 +02:00
aignatov-bio 9377628f5e
Release team space after update image [SCI-3299] (#1656) 
* Release team space after update image
 2019-04-11 09:20:05 +02:00
Jure Grabnar 8420974779 Move scrollTop to reloadActivities 
Closes SCI-3302
 2019-04-10 18:45:12 +02:00
Jure Grabnar 3c47521f0e Reset scrollbar after selecting date filter 
Closes SCI-3302
 2019-04-10 15:46:30 +02:00
Oleksii Kriuchykhin d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload 
Improve the image file upload into RTE input fields [SCI-3131]
 2019-04-10 14:04:06 +02:00
aignatov-bio cfbb2a83a6
Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities 
Update API endpoints for new activities [SCI-3295]
 2019-04-10 13:46:30 +02:00
Mojca Lorber c8ddae4d1e Fix activity card visuals 2019-04-10 12:37:13 +02:00
Urban Rotnik caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +02:00
aignatov-bio 7ef7e2397f
Change activity filter order and reduce custom date label size [SCI-3301] (#1651) 
* Change activity filter order and reduce custom date label size

* Fix hound
 2019-04-09 14:18:22 +02:00
Urban Rotnik ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Urban Rotnik a3932cc67f New asset box style update 2019-04-09 14:17:40 +02:00
aignatov-bio e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
aignatov-bio a086f88541
Disable save button while image loading (#1646) 2019-04-09 09:07:58 +02:00
Anton Ignatov 811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Urban Rotnik 26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar bc9eff2ef5 Add asset validation on wopi creation 
Missing file
 2019-04-04 17:05:25 +02:00
Jure Grabnar d9a9045658 Hound formatting 2019-04-04 17:05:25 +02:00
Jure Grabnar d60cc2cd1c Refactor create_wopi_file 2019-04-04 17:05:25 +02:00
Jure Grabnar 56bb62c5b0 Addtional formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar 20446fb39d Hound formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar 7ac88ee84b Change icons to be relative 2019-04-04 17:05:25 +02:00
Jure Grabnar cbf109f884 Fix create WOPI file button 
Closes SCI-3137
 2019-04-04 17:05:25 +02:00
Jure Grabnar fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Jure Grabnar 983f90ddf6 Add file name presence check 2019-04-04 17:05:25 +02:00
Jure Grabnar 38e47b93ab Update labels 2019-04-04 17:05:25 +02:00
Jure Grabnar b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Jure Grabnar 613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Jure Grabnar 9a4cd4fda2 Add file_present true 2019-04-04 16:57:36 +02:00
Jure Grabnar 3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
aignatov-bio a1047f4597
Fix activities wording [SCI-3287] (#1635) 
* Fix activities wording

* Adding project to export protocol
 2019-04-04 10:45:35 +02:00
Miha Mencin 97d9fde3fd SCI-3286 add breadcrumbs to the report activity 2019-04-04 10:30:31 +02:00
Oleksii Kriuchykhin e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Oleksii Kriuchykhin d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Alex Kriuchykhin d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2 
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
 2019-04-03 21:14:36 +02:00
Oleksii Kriuchykhin 14978f7c1f Fix activity creation for editing wopi file in protocol repository [SCI-3281] 2019-04-03 19:51:54 +02:00
Alex Kriuchykhin 91d379fc78
Merge pull request #1636 from okriuchykhin/ok_SCI_3285 
Fix missing old activities on task activity page and user popup in global activities [SCI-3285]
 2019-04-03 19:04:13 +02:00
Alex Kriuchykhin c86b535a25
Merge pull request #1638 from okriuchykhin/ok_SCI_3289 
Improve large image saving after editing [SCI-3289]
 2019-04-03 16:44:08 +02:00
Oleksii Kriuchykhin 9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Jure Grabnar f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar 26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin 8c2b2513b0 Fix user popup in global activities [SCI-3285] 2019-04-03 12:53:52 +02:00
Alex Kriuchykhin bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281 
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
 2019-04-03 11:39:59 +02:00
Jure Grabnar 6a9ef8b98d
Merge pull request #1633 from jbargu/jg_sci_3276 
Wrap user sign_in into rescue block [SCI-3276]
 2019-04-03 10:56:56 +02:00
aignatov-bio e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) 
* Fix bug with update protocol from repository and modal disable button
 2019-04-03 09:18:18 +02:00
Jure Grabnar 91820ed9c1 Wrap sign_in user into begin/rescue block 
Closes SCI-3276
 2019-04-03 09:09:20 +02:00
Oleksii Kriuchykhin 01ffb43c23 Include old activites assigned to the task [SCI-3285] 2019-04-02 18:37:55 +02:00
Jure Grabnar b679eb4a58
Merge pull request #1630 from jbargu/jg_sci_3279_3283 
Step with Office Online files can be deleted, asset name is shown in activities screen [SCI-3279, 3283]
 2019-04-02 17:59:51 +02:00
Oleksii Kriuchykhin c47d243b1f Disable WOPI edit button in read only mode [SCI-3281] 2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
aignatov-bio 3a2f78d7a8
Fix freeze top pane tags bug (#1627) 2019-04-02 16:05:48 +02:00
Anton Ignatov 94efd2e649 Fix tests 2019-04-02 16:04:50 +02:00
Alex Kriuchykhin 93350d1ac8
Merge pull request #1626 from okriuchykhin/ok_SCI_3174 
Fix comment menu position on canvas [SCI-3174]
 2019-04-02 15:10:14 +02:00
Alex Kriuchykhin 76e016f164
Merge pull request #1628 from urbanrotnik/ur-sci-3282-fix-dates-for-activities 
Show date value without link [SCI-3282]
 2019-04-02 14:40:53 +02:00
Urban Rotnik 86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Jure Grabnar a2623b5124 Fix non-existant current_team in WOPI create_activity 
Closes SCI-3279
 2019-04-02 14:20:01 +02:00
Anton Ignatov c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
Urban Rotnik 8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
Oleksii Kriuchykhin 91a87cbf3a Fix comment menu position on canvas [SCI-3174] 2019-04-02 12:54:21 +02:00
Jure Grabnar ac1b43165d
Merge pull request #1625 from jbargu/jg_sci_3257 
Remove html_safe on activities [SCI-3257]
 2019-04-02 12:04:01 +02:00
aignatov-bio e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
Jure Grabnar 8443ed0fb3 Add sanitize input to old activity messages 2019-04-02 11:25:07 +02:00
Jure Grabnar 5dd0cf091f Remove html_safe from activites head title 2019-04-02 11:16:08 +02:00
aignatov-bio e93b0c3109
Adding preload filters for global activities [SCI-3254] (#1619) 
* Adding preload filter for global activities

* Adding link to task activities
 2019-04-02 11:14:36 +02:00
Urban Rotnik 6ec22c0b3b
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory 
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
 2019-04-02 11:02:57 +02:00
Jure Grabnar 85bbdcf4b3 Remove .html_safe from activity 
Closes SCI-3257
 2019-04-02 11:02:22 +02:00
Urban Rotnik 73dd6678ee Fix for show date value 2019-04-02 10:36:11 +02:00
aignatov-bio daaa6a367b
Adding custom scrollbar to global activities [SCI-3206] (#1623) 
* Adding custom scrollbar to global activities
 2019-04-02 09:56:50 +02:00
Urban Rotnik dc0c629798 Fix to show report name in Activities 2019-04-01 15:58:28 +02:00
Urban Rotnik 0ed96d68de Add step position for steps in Protocol repository. Add default value for blank names also. 2019-04-01 15:58:17 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Jure Grabnar 5443bfcbd1
Merge pull request #1622 from jbargu/jg_3242 
Remove JS memory leak on project index page
 2019-04-01 15:36:30 +02:00
Alex Kriuchykhin b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255 
Add global activities to reports [SCI-3255]
 2019-04-01 15:07:06 +02:00
Jure Grabnar d9c10c6c7b Remove reapplying callback actions on project index page 
Closes SCI-3242.
 2019-04-01 15:02:47 +02:00
Jure Grabnar e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
mlorb b24a07f1c8
Merge pull request #1616 from mlorb/ml-sci-3237 
Change activities for task protocols [SCI-3237]
 2019-04-01 14:32:16 +02:00
Jure Grabnar 83130426e2
Merge pull request #1617 from jbargu/jg_3244 
Duplicated activity, report activity ... [SCI-3244]
 2019-04-01 14:31:53 +02:00
Urban Rotnik 213226fba8
Merge pull request #1620 from urbanrotnik/ur-sci-3245-activity-error-when-delete-result 
Fix showing result icon when result is deleted [SCI-3245]
 2019-04-01 14:25:19 +02:00
Jure Grabnar 111b0e2b7f
Merge pull request #1615 from jbargu/jg_sci_3252 
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
 2019-04-01 12:30:48 +02:00
Oleksii Kriuchykhin 98e58ff7eb Add global activities to reports [SCI-3255] 2019-04-01 11:26:51 +02:00
Urban Rotnik 03dcc91cf1 Fix showing result icon when result is deleted 2019-04-01 09:58:13 +02:00
Jure Grabnar 3a79f7ca01 Add activity to save_pdf_to_inventory_item 2019-03-29 16:01:36 +01:00
Jure Grabnar 6533368763 Add activity for importing inv items 2019-03-29 15:41:34 +01:00
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Jure Grabnar f843092aac Add activity for moving worklfows 
Closes SCI-3252
 2019-03-29 13:51:17 +01:00
Alex Kriuchykhin a9501603c2
Merge pull request #1613 from okriuchykhin/ok_SCI_3172 
Fix unconfirmed users clean-up issues [SCI-3172]
 2019-03-29 13:10:34 +01:00
Jure Grabnar fe3e92468f
Merge pull request #1611 from jbargu/jg_sci_3226_3243 
Too much empty space between date buttons [SCI-3243] [SCI-3226]
 2019-03-29 12:30:53 +01:00
Oleksii Kriuchykhin 7d4fbcb32e Fix unconfirmed users clean-up issues [SCI-3172] 2019-03-29 11:11:53 +01:00
Jure Grabnar 8bc10e1ca7 Change breadcrumbs for cloning experiment to destination project 2019-03-29 09:52:07 +01:00
Alex Kriuchykhin 913bdd91be
Merge pull request #1610 from okriuchykhin/ok_SCI_3251 
Make subject search more precise in global activities [SCI-3251]
 2019-03-29 09:28:13 +01:00
aignatov-bio b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605) 
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
 2019-03-29 09:26:27 +01:00
aignatov-bio ba4b35d004
Fix date hot buttons (#1606) 2019-03-29 09:07:46 +01:00
aignatov-bio ce7bbd6b07
Adding deselect button to objects filter and some localizations fix (#1608) 2019-03-29 09:04:58 +01:00
Jure Grabnar 226cf21787 No top margin for select custom dates button 2019-03-29 08:42:15 +01:00
Jure Grabnar e9133bbea9 Remove empty space between date buttons 
Closes SCI-3243
 2019-03-29 08:29:16 +01:00
Jure Grabnar e8a4fd5360 Fix date label 
Closes SCI-3226
 2019-03-29 08:18:15 +01:00
Alex Kriuchykhin 88b4ca0798
Merge pull request #1609 from okriuchykhin/ok_SCI_3213 
Fix role name in change user role in team activity [SCI-3213]
 2019-03-28 17:32:51 +01:00
Alex Kriuchykhin 9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229 
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
 2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin 58af23e9b5 Make subject search more precise in global activities [SCI-3251] 2019-03-28 17:03:05 +01:00
Oleksii Kriuchykhin 6bc944fcc7 Fix role name in change user role in team activity [SCI-3213] 2019-03-28 16:26:07 +01:00
Oleksii Kriuchykhin 5008339d81 Add handling of links for objects from another team [SCI-3229][SCI-3241] 2019-03-28 14:56:34 +01:00
Oleksii Kriuchykhin d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
mlorb 5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215 
Implement missing tests for global activities [SCI-3215][SCI-3219]
 2019-03-28 11:10:38 +01:00
aignatov-bio 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Alex Kriuchykhin 9f5b331b9f
Merge pull request #1604 from okriuchykhin/ok_SCI_3177 
Fix experiment workflow image display after touching [SCI-3177]
 2019-03-28 09:51:01 +01:00
Urban Rotnik 685b7138b7
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list 
Add message for empty activity list [SCI-3224]
 2019-03-28 09:16:29 +01:00
Urban Rotnik d0a8652969 Add message for empty activity list 2019-03-28 09:14:01 +01:00
aignatov-bio 8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects 2019-03-28 09:13:34 +01:00
aignatov-bio 5c9d2cbc60
Merge pull request #1601 from aignatov-bio/ai-sci-3175-help-window-does-not-close-bug 
Fix tooltip freeze bug [SCi-3175]
 2019-03-28 09:12:37 +01:00
Jure Grabnar aa186f675a Fix clear filter not clearing date label 
Closes SCI-3226
 2019-03-27 18:47:34 +01:00
Oleksii Kriuchykhin 37c559debd Fix experiment workflow image display after touching [SCI-3177] 2019-03-27 17:02:59 +01:00
Jure Grabnar 07609d34c8 User/teams are now alphabetically listed 2019-03-27 15:34:01 +01:00
Jure Grabnar 9881ff38ee Add color to HOT buttons 2019-03-27 15:34:01 +01:00
Anton Ignatov 3676aeb83c Adding localization to subjects group name in filters 2019-03-27 15:30:04 +01:00
aignatov-bio 5258c05c69
Merge pull request #1599 from aignatov-bio/ai-sci-3210-add-placeholder-to-filters 
Adding placeholders to filters [SCI-3210]
 2019-03-27 14:40:22 +01:00
Anton Ignatov 03123c34f8 adding date placeholder 2019-03-27 14:39:29 +01:00
Anton Ignatov 46ee2557d4 Fix tooltip stuck bug 2019-03-27 13:53:32 +01:00
Matej Zrimšek 318c322a1c Fix sorting of custom columns on repository datatables 2019-03-27 12:58:55 +01:00
Matej Zrimšek 632835cf30 Fix fetching assigned repository rows when using filter & refactor it 2019-03-27 12:58:55 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Anton Ignatov 1d244508f5 Adding placeholders to filters 2019-03-27 11:19:58 +01:00
aignatov-bio c2e1e85913
Adding localization for activity name and activity group (#1598) 2019-03-27 10:33:33 +01:00
Miha Mencin 1b19e67c07 Revert "Step header changes, removed vertical line" 
This reverts commit b0f0ded87d.
 2019-03-27 10:21:40 +01:00
Alex Kriuchykhin d0a5f4fd6e
Merge pull request #1596 from okriuchykhin/ok_SCI_3173 
Fix duplicated projects in new report modal [SCI-3173]
 2019-03-27 09:28:40 +01:00
Urban Rotnik 2487089dd3 Rename dropdown labels for Activities, Users and Teams 2019-03-27 05:47:54 +01:00
Oleksii Kriuchykhin dab75d5aec Fix duplicated projects in new report modal [SCI-3173] 2019-03-26 17:24:30 +01:00
Miha Mencin c3c940b7a3
Merge pull request #1595 from biosistemika/SCI-3236-bug-when-adding-result-commnet 
[SCI-3236] showing font-awesome icon based on result type
 2019-03-26 17:14:30 +01:00
Miha Mencin 8e12e0f5b3 [SCI-3236] showing font-awesome icon based on result type 2019-03-26 17:04:31 +01:00
aignatov-bio a3c1796497
Adding arrow to drop down [SCI-3212] (#1594) 
* Adding arrow to dropdown
 2019-03-26 16:49:12 +01:00
aignatov-bio 6012513c13
Reduce font size of filters title [SCI-3208] (#1592) 
* reduce font size of filters titles;

* fix new title
 2019-03-26 16:47:36 +01:00
Oleksii Kriuchykhin 2ff43a3320 Change filtering logic when no filters are selected [SCI-3223] 2019-03-26 16:04:03 +01:00
Alex Kriuchykhin 935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199 
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
 2019-03-26 16:02:44 +01:00
aignatov-bio 54fd3a748b
Adding activity groups [SCI-3203] (#1588) 
* Adding activty groups
 2019-03-26 15:29:21 +01:00
Urban Rotnik 738d6f0f8c
Merge pull request #1590 from urbanrotnik/ur-SCI-3209-circles-to-checkboxes 
Add fontawesome checkmark before dropdown item [SCI-3209]
 2019-03-26 13:49:19 +01:00
Miha Mencin 6e5362453b
Merge pull request #1589 from biosistemika/SCI-3232-bugfixes 
[SCI-3232] Can not save new/edited text/table result, can not archive text/table result, can not save edited file result.
 2019-03-26 13:02:23 +01:00
Urban Rotnik 68d87efaa0
Merge pull request #1582 from urbanrotnik/ur-SCI-3134-changes-to-step-design 
Step header changes, removed vertical line [SCI-3134]
 2019-03-26 12:38:04 +01:00
Urban Rotnik 80cd01c2e5
Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field 
Comment out search field for global activities [SCI-3207]
 2019-03-26 12:37:07 +01:00
Urban Rotnik 96fa620c4c Add fontawesome checkmark before dropdown item 
SCI-3209
 2019-03-26 12:35:17 +01:00
Miha Mencin 9a30d7be9d SCI-3232 renaming the attribute name so it doesnt get 'constantized' 2019-03-26 11:39:54 +01:00
aignatov-bio cee3796f35
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left 
Move dropdown container to left [SCI-3203]
 2019-03-26 09:37:12 +01:00
Urban Rotnik 790f4450cc Comment out search field for global activities 2019-03-25 18:15:31 +01:00
Oleksii Kriuchykhin e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Urban Rotnik b0f0ded87d Step header changes, removed vertical line 
SCI-3134
 2019-03-25 17:25:13 +01:00
Miha Mencin 4c3c0ef908 removing activity creation from demo project 2019-03-25 15:45:10 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov 2d5df1b3b7 Moving dropdown container to left 2019-03-25 13:56:32 +01:00
aignatov-bio fd6e622b95
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates 
Remove white spaces for date in global activities [SCI-3205]
 2019-03-25 12:58:35 +01:00
Anton Ignatov c584a0d606 Remove white spaces for date in global activites 2019-03-25 11:06:00 +01:00
Anton Ignatov c8c211f245 Remove whitespace to breadcrumbs 2019-03-25 09:39:17 +01:00
Jure Grabnar 171b2eeedc Remove the title of protocol steps when empty 
Closes SCI-3072
 2019-03-25 09:36:56 +01:00
aignatov-bio 9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype 
Feature/Image annotation
 2019-03-22 16:31:00 +01:00
Anton Ignatov fc7400bec9 fix markup 2019-03-22 13:42:12 +01:00
Anton Ignatov 65521533b4 change js.erb to js 2019-03-22 13:35:11 +01:00
Anton Ignatov 4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
aignatov-bio 723024202e
Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563) 
* Improvments SCI - 3158, 3160, 3156, 3154
 2019-03-22 09:27:50 +01:00
Anton Ignatov bc58f0aecd Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload 2019-03-21 11:48:51 +01:00
aignatov-bio e8827b0d74
Update tags in task info [SCI-3093] (#1575) 
* Adding inline tags selection
 2019-03-21 10:13:07 +01:00
Mojca Lorber c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov 5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov 07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Mojca Lorber e34ddeaefd Remove activities from demo project 2019-03-20 13:25:59 +01:00
Jure Grabnar 5de51f9c58 Prevent smart annotations accessing other teams when importing protocol 
Closes SCI-3163
 2019-03-20 12:58:22 +01:00
aignatov-bio 5d9e4f30d4
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] (#1541) 
* Fix double protocols bug and rake task to rename duplicates
 2019-03-20 12:41:14 +01:00
Oleksii Kriuchykhin 0c2b7959b6 Fix smart annotations in RTE [SCI-3111] 2019-03-20 11:41:36 +01:00
Mojca Lorber 4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Jure Grabnar cf5505d95f Add missing inventory name in notification 
Closes SCI-3149
 2019-03-20 10:52:58 +01:00
Anton Ignatov 29b67be127 Fix team selection in global activities and add link from navbar 2019-03-20 10:33:22 +01:00
Mojca Lorber 42ff1c0a68 fix bug in revert protocol method 2019-03-20 09:43:38 +01:00
Oleksii Kriuchykhin b46f3566ef Fix rendering of HTML in RTE fields [SCI-3111] 2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin eb3d1ea6fe Update RTE for step description [SCI-3111] 2019-03-19 17:42:49 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Mojca Lorber 7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik 1017836c0e Activities service fix 2019-03-19 14:12:39 +01:00
Urban Rotnik fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
aignatov-bio 6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] (#1568) 
*Add permission check for assets editing

* Add check for image format
 2019-03-19 13:52:57 +01:00
Anton Ignatov f606210652 Rubocop fix 2019-03-19 13:52:03 +01:00
Anton Ignatov 87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Alex Kriuchykhin 7db53fad7c
Merge pull request #1566 from okriuchykhin/ok_SCI_3062 
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
 2019-03-19 13:28:05 +01:00
aignatov-bio a0a3c4b97f
Fix file format bug (#1569) 2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin 0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
Oleksii Kriuchykhin 5bc41c1f06 Fix task tags field after merging latest master to feature branch 2019-03-15 14:21:34 +01:00
Urban Rotnik 5dccdbab17 fixup! Fix failing tests 2019-03-15 11:12:10 +01:00
Oleksii Kriuchykhin ba41afe449 Re-orginize TinyMCE init callback [SCI-3062][SCI-3071] 2019-03-15 11:07:57 +01:00
Urban Rotnik 2ea2700837 fixup! Fix failing tests 2019-03-15 10:30:51 +01:00
Oleksii Kriuchykhin 2cc170c3d4 Close RTE on save [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin 645930b8d7 Merge branch 'master' into features/note-section 2019-03-14 16:25:51 +01:00
Urban Rotnik b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik 3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik 7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik 976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin 7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin 9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin ded74044de Fix circle icon in image editor [SCI-2855] 2019-03-11 15:10:38 +01:00
Oleksii Kriuchykhin feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin 80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin 89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Urban Rotnik 3992336db9 Add type and value_for attributes to user hash 2019-03-11 08:37:22 +01:00
Urban Rotnik b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik 9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Urban Rotnik 117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Oleksii Kriuchykhin e3bacd6b9a Fix global activities page after refactoring [SCI-2994][SCI-3024] 2019-03-08 13:09:27 +01:00
Jure Grabnar eceda4909f Move edit_file permission for wopi file in a special function 
Used for overwritting it in addons.

Closes SCI-2949
 2019-03-08 12:22:35 +01:00
Oleksii Kriuchykhin 0b87e8e1e4 Merge branch 'features/global-activities' into ok_SCI_3024_v3 2019-03-08 10:29:51 +01:00
Alex Kriuchykhin bb29a97962
Merge pull request #1557 from okriuchykhin/ok_SCI_3151 
Improve JS files inclusion in export all [SCI-3151]
 2019-03-07 17:46:45 +01:00
Oleksii Kriuchykhin af9daf3a5e Improve JS files inclusion in export all [SCI-3151] 2019-03-07 17:42:47 +01:00
Alex Kriuchykhin ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048 
Fix local storage file download links [SCI-3048]
 2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin 0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
Oleksii Kriuchykhin 8cc95bf491 Embed tables JS files to main HTML of Export All [SCI-3151] 2019-03-07 14:23:10 +01:00
Alex Kriuchykhin d5110a4f87
Merge pull request #1554 from okriuchykhin/ok_SCI_3150 
Fix JS files inclusion in export all report [SCI-3150]
 2019-03-07 11:17:51 +01:00
Oleksii Kriuchykhin 2b239e2f35 Fix JS files inclusion in export all report [SCI-3150] 2019-03-07 11:14:38 +01:00
aignatov-bio ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) 
* Adding side pane filtering and top pane
 2019-03-06 10:34:04 +01:00
aignatov-bio 125d2a3b9b
New inline tags editing in task [SCI 3093] (#1529) 
* Adding inline tags selection
 2019-03-06 09:18:45 +01:00
aignatov-bio b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
Miha Mencin 8fbda40c49
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login 
put the scheduling logic into session create action
 2019-03-05 10:56:48 +01:00
Miha Mencin 9807c80286 move the create action to the tope section of controller 2019-03-05 10:49:36 +01:00
Miha Mencin 67fe486874 put the scheduling logic into session create action 2019-03-05 10:43:39 +01:00
aignatov-bio 6dcaea973d
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold 
Bold text for read messages SCI-3123
 2019-03-05 10:30:16 +01:00
Miha Mencin 6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Anton Ignatov 33682bb561 Bold text for read messages 2019-03-04 13:48:25 +01:00
Oleksii Kriuchykhin c3705ccb25 Improve group collapse JS code [SCI-2994][SCI-3024] 2019-03-04 13:44:43 +01:00
Miha Mencin 2ba040980f reverting the team changes, the scope is not needed 2019-03-01 17:48:38 +01:00
Miha Mencin 844303ae7c SCI-3119 schedule the creaton of template 2019-03-01 17:47:04 +01:00
aignatov-bio d69f8c5636
Merge pull request #1547 from aignatov-bio/ai-sci-3114-recapthca-bug 
Remove script from modal SCI-3114
 2019-03-01 14:58:49 +01:00
Anton Ignatov f636b5adff Remove script from modal 2019-03-01 14:56:06 +01:00
aignatov-bio 9a007b5d75
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity 
Fix missing user name in activty, when moving experiment [SCI-3108]
 2019-03-01 14:16:59 +01:00
Alex Kriuchykhin 985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101 
Move templates project creation for new team to delayed job [SCI-3101]
 2019-03-01 13:55:49 +01:00
Alex Kriuchykhin 09ed7922da
Merge pull request #1543 from okriuchykhin/ok_SCI_3107 
Improve speed of index query in projects overview service [SCI-3107]
 2019-03-01 13:53:56 +01:00
Anton Ignatov 1ae4a60f79 Fix recaptha error 2019-03-01 12:58:31 +01:00
Oleksii Kriuchykhin 1fedb4c91e Improve speed of index query in projects overview service [SCI-3107] 2019-02-28 17:46:34 +01:00
Anton Ignatov 9e472c0ccf Fix missing user name in activty, when moving experiment 2019-02-28 16:06:23 +01:00
Miha Mencin 4f9daa9590 SCI-3112 Change the the comments in demo project generator 2019-02-28 11:39:44 +01:00
Miha Mencin 088a860683
Merge pull request #1539 from biosistemika/features/templates 
Features/templates
 2019-02-28 10:23:13 +01:00
Jure Grabnar 18c738263d
Merge pull request #1536 from jbargu/jg_sci_3100 
Missing item smart annotation in Demo project [SCI-3100, 3098]
 2019-02-28 09:52:28 +01:00
Miha Mencin d03ef2cd2a
Merge branch 'master' into features/templates 2019-02-28 09:41:20 +01:00
Jure Grabnar 93490a1f47 Add missing created_at and fix typo 
Closes SCI-3100, SCI-3098
 2019-02-28 07:29:25 +01:00
Miha Mencin a372ebf07d
Revert "Task info section improvements [SCI - 3058]" 2019-02-27 21:00:11 +01:00
Jure Grabnar 0fbbe8b5de Add result comments to demo project 
Closes [SCI-3100].
 2019-02-27 20:32:28 +01:00
Miha Mencin 576520659c
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations 
added uniquness validator and index on user_projects and user_teams r…
 2019-02-27 19:53:25 +01:00
Oleksii Kriuchykhin 0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00
Jure Grabnar 3acf9b71f8
Merge pull request #1525 from jbargu/jg_sci_3096_and_other_demo_issues 
Demo project improvements [SCI-3096], [SCI-3097], [SCI-3098], [SCI-3099], [SCI-3102]
 2019-02-27 15:43:14 +01:00
aignatov-bio 7ced0b367b
Merge pull request #1531 from aignatov-bio/ai-sci-3095-notification-bug-on-signup 
First what's up notification user gets already at signup [SCI-3095]
 2019-02-27 15:42:20 +01:00
Jure Grabnar 0699204d3b Add changes for parallel exec discussed with Miha 2019-02-27 15:22:19 +01:00
Miha Mencin 51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik 3121bf1d39 Update tooltip for system notifications dropdown 2019-02-27 14:49:18 +01:00
Anton Ignatov a6666c688c Adding check for user tutorial 2019-02-27 13:55:46 +01:00
Oleksii Kriuchykhin 0266f6bd3c Change search on subject query constaruction logic [SCI-3014] 2019-02-27 13:21:05 +01:00
Anton Ignatov 978c4bcb69 Fixed, trying to save object instead name 2019-02-27 10:43:46 +01:00
Jure Grabnar 30bc536d07 Fix smart annotations in demo project 
Closes SCI-3097, SCI-3102.
 2019-02-26 14:36:48 +01:00
Oleksii Kriuchykhin 74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin a0d2f7c676 Move templates project creation for new team to delayed job [SCI-3101] 2019-02-26 13:32:00 +01:00
Oleksii Kriuchykhin 61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Jure Grabnar 2464a45f83 Fix ordering for another step in demo project 
Closes SCI-3098.
 2019-02-26 08:34:50 +01:00
Jure Grabnar c409c39e60 Fix demo project's checklist item ordering 
Closes SCI-3099.
 2019-02-26 08:26:02 +01:00
Jure Grabnar b6dd783114 Improve generation of a demo project 
Closes SCI-3096
 2019-02-26 08:06:07 +01:00
Urban Rotnik c8ab9f8ff8 Fix tests 2019-02-26 08:04:05 +01:00
Urban Rotnik 5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Anton Ignatov a4cabb203b Task info section improvements 2019-02-25 16:55:09 +01:00
Urban Rotnik 3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Miha Mencin 76c3db0b11 added layout, added css, added select2 lib, WIP 2019-02-25 16:50:38 +01:00
Urban Rotnik 5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
aignatov-bio 0bf7cb4c59
Merge pull request #1519 from biosistemika/ai-adding-multiple-select-plugin 
Adding new Select2 library with customizations
 2019-02-25 16:46:07 +01:00
Jure Grabnar 4edab957a4
Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red 
Due date is not red for today anymore [SCI-3069]
 2019-02-25 13:20:50 +01:00
Jure Grabnar d7e91676c3 Rename initial experiment back to the old one 2019-02-24 08:13:57 +01:00
Jure Grabnar b4199b28e4 Remove turbolinks:load from the project show page 
Also rename Demo project experiment back to PCR.

Closes SCI-3081.
 2019-02-22 19:46:42 +01:00
Anton Ignatov 6971d1a55d Adding new Select2 library with customization 2019-02-22 16:40:33 +01:00
aignatov-bio aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications 
Notification changes on settings page [SCI 3084] (#1517)
 2019-02-22 14:01:38 +01:00
aignatov-bio 606708987f
Notification changes on settings page [SCI 3084] (#1517) 
* Fix css and update text settings
 2019-02-22 13:20:51 +01:00
Jure Grabnar f98d6fbd4d Remove archived task in Demo project 
Closes SCI-3082.
 2019-02-22 11:58:32 +01:00
Jure Grabnar f9cb8c8803 Add utc conversion to due_date 2019-02-22 10:47:39 +01:00
Jure Grabnar 87dcf301fb Change due_date calculation to DateTime#end_of_day 2019-02-22 10:23:12 +01:00
Jure Grabnar fb533eb9d3
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed 
Add action_name to sidebar cache as dependency [SCI-2930]
 2019-02-22 10:04:57 +01:00
Jure Grabnar 7f0ea48dff
Merge pull request #1515 from jbargu/jg_sci_3080_demo_project_rename 
Rename Demo project and create rake task to create it on existing users [SCI-3080]
 2019-02-22 10:01:39 +01:00