scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5639 commits 70 branches 179 tags 165 MiB
Commit graph

4395 commits

Author SHA1 Message Date
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