scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 14:41:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
6274 commits 43 branches 185 tags 169 MiB
Commit graph

6274 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Alex Kriuchykhin
0d8b33eba7
Merge pull request #1974 from okriuchykhin/ok_SCI_3757 
ActiveStorage fixes after latest master merge [SCI-3757]
 2019-08-09 15:20:45 +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
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