scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6044 commits 70 branches 179 tags 165 MiB
Commit graph

6044 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 5e3f1d59f5
Fix inventory rows import (#1997) 2019-08-21 15:32:45 +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
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