Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +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
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
aignatov-bio
|
b57e79a557
|
Fix tables (#1963)
|
2019-08-09 09:41:32 +02:00 |
|
Alex Kriuchykhin
|
4cb4373ae1
|
Merge pull request #1970 from okriuchykhin/ok_SCI_3678
Fix mime-types version [SCI-3678]
|
2019-08-08 15:36:35 +02:00 |
|
Oleksii Kriuchykhin
|
e19736427c
|
Fix mime-types version [SCI-3678]
|
2019-08-08 15:35:25 +02:00 |
|
Alex Kriuchykhin
|
2f43b9ce9a
|
Merge pull request #1969 from okriuchykhin/ok_SCI_3678
Rollback cucumber-rails version [SCI-3678]
|
2019-08-08 15:19:25 +02:00 |
|
Oleksii Kriuchykhin
|
abd568084d
|
Rollback cucumber-rails version [SCI-3678]
|
2019-08-08 15:17:39 +02:00 |
|
Alex Kriuchykhin
|
b00636c525
|
Merge pull request #1968 from okriuchykhin/ok_SCI_3678
Fix production build and update packages [SCI-3678]
|
2019-08-08 14:53:45 +02:00 |
|
Oleksii Kriuchykhin
|
9c2cd7bd1c
|
Rollback faker version [SCI-3678]
|
2019-08-08 14:43:43 +02:00 |
|
Oleksii Kriuchykhin
|
a5d47e75c5
|
Remove duplicated protocols.js.erb file [SCI-3678]
|
2019-08-08 14:33:07 +02:00 |
|
Oleksii Kriuchykhin
|
d52df56fc4
|
Fix production build and update packages [SCI-3678]
|
2019-08-08 14:03:15 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Alex Kriuchykhin
|
dac4d71c5d
|
Merge pull request #1962 from okriuchykhin/ok_SCI_3680
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
|
2019-08-07 16:01:27 +02:00 |
|
Oleksii Kriuchykhin
|
b4f632dba8
|
Remove dowload endpoint from assets controller [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Oleksii Kriuchykhin
|
d942788581
|
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Alex Kriuchykhin
|
328f8dd8a0
|
Merge pull request #1966 from okriuchykhin/ok_SCI_3681
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-07 10:49:05 +02:00 |
|
aignatov-bio
|
aa5061a1af
|
Add custom context menu to TinyMCE images [SCI-3582] (#1944)
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
|
2019-08-07 10:28:42 +02:00 |
|
Jure Grabnar
|
c3fd810691
|
Remove sample_custom_field factory
|
2019-08-06 23:30:05 +02:00 |
|
Oleksii Kriuchykhin
|
973fc775c0
|
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-06 17:09:00 +02:00 |
|
Alex Kriuchykhin
|
887faeb344
|
Merge pull request #1955 from okriuchykhin/ok_SCI_3679
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-08-06 16:09:13 +02:00 |
|
Oleksii Kriuchykhin
|
f3849e2ece
|
Fix TinyMCE plugings config [SCI-3679]
|
2019-08-06 15:46:55 +02:00 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +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 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +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 |
|