Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +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 |
|
aignatov-bio
|
d3ccdbd83e
|
Create copy permission (#2017)
|
2019-08-29 13:39:22 +02:00 |
|
aignatov-bio
|
4d20cd7d55
|
Fix copy inventory permission (#2016)
|
2019-08-26 14:48:38 +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 |
|
Miha Mencin
|
a7bb7a1dd8
|
additional checking for icon: check also if user is guest
|
2019-08-26 11:20:18 +02:00 |
|
aignatov-bio
|
b3e3c443f0
|
Fix big gap in title of navbar (#2015)
|
2019-08-26 11:20:03 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Anton Ignatov
|
d1e1da8580
|
Fix permission check for invite users
|
2019-08-14 14:47:02 +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 |
|
aignatov-bio
|
aad726ac40
|
Update CSS for share modal (#1978)
|
2019-08-12 15:02:16 +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 |
|
Oleksii Kriuchykhin
|
32054c5516
|
Handle situation for assets without blob in list sorting [SCI-3757]
|
2019-08-09 15:17:19 +02:00 |
|
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
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
973fc775c0
|
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-06 17:09:00 +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 |
|
Anton Ignatov
|
e2e876b2a3
|
Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests
|
2019-08-05 13:51:04 +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 |
|
aignatov-bio
|
f0b7771e19
|
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export
Fix protocol copy, add metadata to assets [SCI-3629]
|
2019-08-05 12:55:16 +02:00 |
|
Anton Ignatov
|
feadd940f7
|
Fix duplicate for TinyMCE model
|
2019-08-05 11:33:49 +02:00 |
|
Anton Ignatov
|
24da016465
|
Reuse duplicate file method
|
2019-08-05 11:30:36 +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
|
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 |
|