Commit graph

6126 commits

Author SHA1 Message Date
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
Urban Rotnik 0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +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
Miha Mencin d1ecdedd59 SCI-3768 remove .freeze from multiple constants 2019-08-12 22:31:47 +02:00
aignatov-bio aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Urban Rotnik c213f2fe2a
Merge pull request #1977 from urbanrotnik/ur-sci-3761-unable-to-access-shared-inventory
Fix for inventory-sharing [SCI-3761]
2019-08-12 13:47:10 +02:00
Urban Rotnik dc4751e49a Update scope 'accessible_by_teams' and fix load_vars method in controllers 2019-08-12 10:55:30 +02:00
Urban Rotnik b1dba8013a
Merge pull request #1972 from biosistemika/features/inventory-improvements
Features/inventory improvements
2019-08-09 15:21:12 +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 786716974b Add validation for team on TeamRepository 2019-08-09 14:15:50 +02:00
Urban Rotnik 23d7d117e9 Remove Repository's team from sharring list 2019-08-09 14:15:50 +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 6cbece9f86 Add service for multiple share 2019-08-09 14:15:49 +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 3c1f28ec06 fix smart annotation permission check 2019-08-09 14:13:03 +02:00
Mojca Lorber 71b881cbdf fix failing tests 2019-08-09 14:13:03 +02:00
Mojca Lorber 4c7c7ccdf1 Add ability to browse through shared inventories to smart annotations 2019-08-09 14:13:03 +02:00
Mojca Lorber c21a648c29 Fix failing tests 2019-08-09 14:13:02 +02:00
Mojca Lorber 0e5afa6048 Small refactor 2019-08-09 14:13:02 +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
Urban Rotnik 171cdb319b Add ShareInventory activities 2019-08-09 14:13:01 +02:00
Mojca Lorber b005f90e95 Add tests for permission can_read_repository 2019-08-09 14:13:01 +02:00
Mojca Lorber 7e9be932f3 Make scope for repositories accessible by teams and simplify read permission 2019-08-09 14:13:00 +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
Urban Rotnik 1a77702fa7 Add uniq index for Repository and Team in TeamRepositories 2019-08-09 14:13:00 +02:00
Urban Rotnik 5456c1e38a Add basic controller for TeamRepositories 2019-08-09 14:12:59 +02:00
Urban Rotnik 077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
Urban Rotnik f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
aignatov-bio b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Urban Rotnik 50045b9796
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new
Add additional NewStep button [SCI-3733]
2019-08-06 15:26:51 +02:00
Jure Grabnar dc48e8b339
[SCI-3567] Add check_pending! call for test migrations (#1960)
[SCI-3567] Add check_pending! call for test migrations
2019-08-06 14:11:34 +02:00
Jure Grabnar a9d67ba151
[SCI-3588] Security precautions for omniauth CVE-2015-9284 (#1961)
[SCI-3588] Security precautions for omniauth CVE-2015-9284
2019-08-05 13:14:21 +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 d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions
Close SCI-3588
2019-07-31 16:59:38 +02:00
Jure Grabnar 6546bd1532 Add omniauth-rails_csrf_protection gem
Close SCI-3588
2019-07-31 16:05:06 +02:00
Jure Grabnar c63737f750 Add check_pending! call for test migrations
Close SCI-3567
2019-07-31 14:57:47 +02:00
Jure Grabnar b12403b769 Add comment name fix as Urban suggested 2019-07-31 09:23:22 +02:00
Jure Grabnar 971f52b4b0
RTE image in search does not have preview (#1952)
RTE image in search does not have preview
2019-07-30 07:44:54 +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