Commit graph

1747 commits

Author SHA1 Message Date
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
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
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
aignatov-bio
b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Jure Grabnar
d9ce3e5e8e
[SCI-3674] Remove width on comments (#1954)
[SCI-3674] Remove width on comments
2019-08-05 13:14:03 +02:00
Jure Grabnar
b12403b769 Add comment name fix as Urban suggested 2019-07-31 09:23:22 +02:00
Jure Grabnar
dbebde3370
Merge pull request #1953 from jbargu/jg_sci_3673
Revalidate internal dimension when dragging
2019-07-30 07:44:36 +02:00
Urban Rotnik
4699ba718a Fix showing errors 2019-07-26 11:32:51 +02:00
Jure Grabnar
39fbd18316 Remove width on commments
Closes SCI-3674
2019-07-25 16:46:27 +02:00
Jure Grabnar
a579328614 Revalidate internal dimension when dragging
Close SCI-3673
2019-07-25 16:37:15 +02:00
Jure Grabnar
f44404a1f8
Merge pull request #1946 from jbargu/jg_sci_3704
Fix Handsontable error when generation report
2019-07-25 11:28:46 +02:00
Jure Grabnar
06657dbdf6
Add spinner when editing image annotation (#1948)
Add spinner when editing image annotation
2019-07-25 11:28:13 +02:00
Urban Rotnik
1b9db2f61e Fix for file annotating on Safari 2019-07-24 14:16:29 +02:00
Jure Grabnar
cdad167be2 Add spinner when editing image annotation
Close SCI-3710
2019-07-23 15:02:33 +02:00
Jure Grabnar
5847a8b05c Convert HOT table after it was initialized
Closes SCI-3704
2019-07-23 14:17:22 +02:00
aignatov-bio
a8623002e6
Small UI changes [SCI-3699] (#1935)
* Small ui changes

* Markup fix

* Add class for addons
2019-07-15 13:28:20 +02:00
aignatov-bio
3c32fe0895
Fix formulas in table report (#1934) 2019-07-15 13:27:27 +02:00
Jure Grabnar
eb615ea8dd
[SCI-3670] Show protocols at external protocols tab (#1933)
[SCI-3670] Show protocols at external protocols tab
2019-07-15 11:24:01 +02:00
aignatov-bio
894e201e1b
Fix big file issue in step attachments [SCI-3682] (#1919)
* Fix big file issue in step atachments

* Fix markup
2019-07-15 11:00:01 +02:00
Jure Grabnar
d210b0b152 Trigger loading of latest publications when page is loaded
Closes SCI-3670
2019-07-15 08:52:17 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
2019-07-12 15:52:40 +02:00
aignatov-bio
c6152ccddb
Fix big table issue in ProtocolIo preview (#1927) 2019-07-12 11:17:51 +02:00
aignatov-bio
d8d04b89cd
Fix autosave issue in mozzila (#1925) 2019-07-12 11:15:45 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
aignatov-bio
70589126c3
Fix autosave for steps (#1926) 2019-07-12 10:16:49 +02:00
Urban Rotnik
d5fbe5ecd7 Fix for safari on external protocols tab 2019-07-11 11:53:49 +02:00