Commit graph

1823 commits

Author SHA1 Message Date
aignatov-bio
c652bb0d44
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button
Fix missing expand all button [SCI-3878]
2019-09-18 14:59:29 +02:00
aignatov-bio
ce91759ee2
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error
Fix step table error [SCI-3879]
2019-09-18 14:59:16 +02:00
Anton Ignatov
0adb016293 Fix missing expand all button 2019-09-18 12:33:48 +02:00
Anton Ignatov
146c725e89 Fix step table error 2019-09-18 11:47:33 +02:00
aignatov-bio
d028856fe0
Fix hidden buttons in inventory (#2063) 2019-09-18 11:36:30 +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
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
Alex Kriuchykhin
b8a5b1b542
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
2019-09-09 11:08:02 +02:00
aignatov-bio
16ae00782a
Fix new step button on empty task [SCI-3826] (#2026)
* Fix new step button on empty task

* Fix markup
2019-09-09 10:43:38 +02:00
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin
12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
SCI-3818-unshared-inventory-screen
2019-09-09 09:30:34 +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
15dc25cee9
Fix handson table initialization [SCI-3749] (#2021)
* Fix handson table initialization

* Fix markup
2019-09-05 08:35:28 +02:00
aignatov-bio
b8e68e02a1
Fix error, when cancel tag editing (#2025) 2019-09-05 08:34:33 +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
66326d90e5
Fix shared icon show/hidden (#2014) 2019-08-26 11:24:22 +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
e682a3e5d9
Fix steps description and table saving (#1984) 2019-08-21 11:05:49 +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
a505ef2462
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams

* Replace with current team
2019-08-19 14:01:48 +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
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +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
61af9e21ad Fix datatable filter position 2019-08-09 14:22:24 +02:00
Urban Rotnik
d04b0ccff1 Move '+ new inventory' link above list in sidebar 2019-08-09 14:15:51 +02:00
Urban Rotnik
7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik
32783576c1 Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
2019-08-09 14:15:50 +02:00
Urban Rotnik
2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Mojca Lorber
26bd81621f Add new icons also to the inventories list in navigation 2019-08-09 14:13:02 +02:00
Mojca Lorber
7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +02:00
Mojca Lorber
15432ac851 Make changes to inventory list in navigation based on new mockup 2019-08-09 14:13:00 +02:00
Mojca Lorber
cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00