Commit graph

6265 commits

Author SHA1 Message Date
Miha Mencin
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
aignatov-bio
5bf3a5d418
Fix sharing check in service [SCI-3798] (#2011)
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder

* Fix sharing check in service

* Fix rebase conflicts
2019-08-26 09:36:41 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
aignatov-bio
96e132c62e
Hide share button for users with one team (#2005) 2019-08-23 11:29:03 +02:00
aignatov-bio
5515bac773
Add assigned items from shared inventories to report (#2002) 2019-08-23 11:28:09 +02:00
Mojca Lorber
50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio
0810699770
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder
2019-08-23 10:57:02 +02:00
Oleksii Kriuchykhin
e19f92bc70 Fix links in emails [SCI-3786] 2019-08-22 15:03:32 +02:00
Oleksii Kriuchykhin
3a87296c7b Fix cucumber tests, switch to chromium-driver [SCI-3786] 2019-08-22 13:38:02 +02:00
Luka Murn
5d3a0d7eea
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views
Remove legacy projects archive HTML views
2019-08-21 17:08:27 +02:00
Luka Murn
701bdbd294 Remove archive controller action 2019-08-21 16:01:12 +02:00
Luka Murn
9ad2490285 Remove the deprecated archive endpoint controller rspec test 2019-08-21 16:00:04 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio
5e3f1d59f5
Fix inventory rows import (#1997) 2019-08-21 15:32:45 +02:00
Oleksii Kriuchykhin
2298ba4e4e Add path method to custom ActiveStorage S3 service [SCI-3765] 2019-08-21 14:33:28 +02:00
Oleksii Kriuchykhin
3918c893db Fix new office file creation [SCI-3778] 2019-08-21 13:26:11 +02:00
Luka Murn
084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Luka Murn
2db39c049e Remove projects archive page 2019-08-21 13:10:54 +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
Miha Mencin
da4a9b2ad4
Merge pull request #2001 from aignatov-bio/ai-sci-3794-share-button-not-visible-for-locked-items
Add new permission check for share button [SCI-3794]
2019-08-21 09:05:00 +02:00
Anton Ignatov
ed8ef7aa8f Fix permission check; 2019-08-20 16:07:22 +02:00
Anton Ignatov
a2c50cbe38 Add new permission check for share button 2019-08-20 15:08:53 +02:00
mlorb
cd962ad815
Merge pull request #1996 from mlorb/ml-sci-3783
Add shared inventory icon [SCI-3783]
2019-08-20 09:28:17 +02:00
Mojca Lorber
530d09df64 add i-shared inventory icon 2019-08-19 15:43:55 +02:00
Luka Murn
ebda2c832a
Merge pull request #1995 from biosistemika/release-1.16.8
Merge release-1.16.8 into master
2019-08-19 15:08:33 +02:00
aignatov-bio
58d9be480f
Remove rename button from dropdown (#1994) 2019-08-19 14:29:38 +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
b6661682ad
Fix shared inventory in task dropdown (#1993) 2019-08-19 13:56:02 +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
Urban Rotnik
9c2cd97fb7
Merge pull request #1990 from urbanrotnik/ur-sci-3756-small-fix-translation
Fix translation for view only permission [SCI-3756]
2019-08-19 09:58:24 +02:00
Urban Rotnik
ef528ccdc6 Fix translation for view only permission 2019-08-19 09:51:28 +02:00
aignatov-bio
d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
aignatov-bio
d741e52427
Fix global search for inventories (#1988) 2019-08-19 09:23:59 +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
Luka Murn
7c2dee0179 Update VERSION to 1.16.8 2019-08-14 16:02:10 +02:00
Luka Murn
0a739785d6
Merge pull request #1986 from aignatov-bio/ai-sci-3776-fix-permission-for-invitation-user-without-team
Fix permission check for invite users [SCI-3776]
2019-08-14 15:10:08 +02:00
Anton Ignatov
d1e1da8580 Fix permission check for invite users 2019-08-14 14:47:02 +02:00
Urban Rotnik
7909aa2cb4
Merge pull request #1982 from urbanrotnik/ur-sci-3759-share-all-inventory
Share inventory with all teams [SCI-3759]
2019-08-14 11:28:41 +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
6fda5401f5
Fix protocol import (#1981) 2019-08-14 09:06:25 +02:00
aignatov-bio
710af85743
Fix template generating (#1980) 2019-08-14 09:06:12 +02:00
Alex Kriuchykhin
960e69eaa8 Fix wopi file download URL [SCI-3757] (#1975) 2019-08-14 09:06:00 +02:00
Urban Rotnik
0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +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
Miha Mencin
dc6af10018
Merge pull request #1979 from biosistemika/SCI-3768-remove-freeze-from-constants
SCI-3768 remove .freeze from multiple constants
2019-08-12 22:52:00 +02:00