Commit graph

699 commits

Author SHA1 Message Date
aignatov-bio 521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
aignatov-bio 1f43f35073 First modal 2019-10-11 11:46:51 +02:00
mlorb ba8ee86c9f
Merge pull request #2128 from mlorb/ml-sci-3966
Fix position of shared inventory icon [SCI-3966]
2019-10-04 15:21:48 +02:00
Mojca Lorber 564321d327 Fix position of shared inventory icon 2019-10-04 15:18:17 +02:00
aignatov-bio b460cd4384 Fix complete button position 2019-10-04 15:17:28 +02:00
aignatov-bio c2c8343c57
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
2019-10-04 09:16:34 +02:00
Oleksii Kriuchykhin 6a6a43f5ff Improve file processing indicator [SCI-3938] 2019-10-01 15:20:46 +02:00
aignatov-bio 675d5eb088 Fix MarvinJS representation in global search 2019-10-01 14:20:20 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar 9f704559ef Fix hound formatting issues 2019-09-30 14:42:15 +02:00
Jure Grabnar 096228abbb Shorten padding format in scss 2019-09-30 14:32:09 +02:00
Urban Rotnik 9397705033 Fix positions of CoSign and Unlock buttons 2019-09-30 13:39:23 +02:00
Urban Rotnik b13c429d26 SystemNotifications count position fixed 2019-09-30 13:12:35 +02:00
Urban Rotnik dfafd4767c Fix Protocol buttons group
[SCI-3929]
2019-09-30 11:51:37 +02:00
Jure Grabnar b286e4adfd Fix styles for notification bar 2019-09-30 11:34:39 +02:00
Jure Grabnar 6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
mlorb 594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637
Redesign of sorting button for projects/experiments cards [SCI-3637]
2019-09-27 12:44:44 +02:00
Jure Grabnar 0c24210f6a
[SCI-3784] Small RTF improvements (#2061)
[SCI-3784] Small RTF improvements
2019-09-27 10:27:57 +02:00
mlorb e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764
Expand clickable area of links in secondary navigation [SCI-3764]
2019-09-27 10:15:12 +02:00
Anton Ignatov e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
Mojca Lorber a85c80d994 Fix bug with inventory navigation height 2019-09-23 16:12:41 +02:00
Mojca Lorber 9f30e05594 Expand clickable area of links in secondary navigation 2019-09-23 14:34:48 +02:00
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
aignatov-bio 52499fa285
Fix pathe to icon for chemical structure (#2056) 2019-09-18 11:18:31 +02:00
Jure Grabnar 40aa1a37a2 Change colors of active buttons TinyMCE
Close SCI-3784
2019-09-17 15:45:27 +02:00
Mojca Lorber 47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio 40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +02:00
Miha Mencin 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
aignatov-bio 481be7b92e
Fix padding to share modal (#2024) 2019-09-03 12:06:16 +02:00
mlorb ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
aignatov-bio d209b3abcd
Update share modal window [SCI-3812] (#2018)
* Update share modal window

* Fix markup
2019-08-29 13:45:27 +02:00
Miha Mencin 0058198bb5
Merge branch 'master' into SCI-3806-shared-status-dropdown 2019-08-26 11:55:25 +02:00
mlorb ffe06d5070
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
2019-08-26 11:29:12 +02:00
aignatov-bio b3e3c443f0
Fix big gap in title of navbar (#2015) 2019-08-26 11:20:03 +02:00
Miha Mencin 9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
Mojca Lorber 50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
aignatov-bio 4730e7bfee
Change notification counter position (#2000) 2019-08-21 10:39:56 +02:00
aignatov-bio 0b85dcbead
Fix long inventory names (#1999) 2019-08-21 10:39:48 +02:00
aignatov-bio e2ad383c69
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title

* Fix markup
2019-08-21 10:39:37 +02:00
aignatov-bio 2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991)
* Add inline editing for inventories

* Remove old locals

* Markup fix
2019-08-19 13:30:56 +02:00
aignatov-bio d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Miha Mencin 5adb745743
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons
Fix assign/unassign buttons [SCI-3785]
2019-08-19 08:51:14 +02:00
Anton Ignatov ec57e0aa91 Fix assign/unassign buttons 2019-08-16 10:05:01 +02:00
aignatov-bio 737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues

* Fix tests
2019-08-13 11:04:19 +02:00
aignatov-bio aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Urban Rotnik d04b0ccff1 Move '+ new inventory' link above list in sidebar 2019-08-09 14:15:51 +02:00