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
7102 commits 70 branches 179 tags 165 MiB
Commit graph

7102 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mlorb bfd928b8fc
Merge pull request #2373 from mlorb/ml-sci-4293 
Fix buttons style [SCI-4293]
 2020-01-30 13:40:37 +01:00
mlorb a2afa11fef
Merge pull request #2378 from mlorb/ml-sci-4311 
Fix scroll position on protocol and result page [SCI-4311]
 2020-01-30 13:39:16 +01:00
Urban Rotnik 7813d3ab75
Merge pull request #2363 from urbanrotnik/ur-sci-4190 
Make less opacity when editing or adding row [SCI-4190]
 2020-01-30 13:24:20 +01:00
Urban Rotnik 0991a26ee8
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import 
Fix import for old activities [SCI-4211]
 2020-01-30 13:08:33 +01:00
Urban Rotnik 64a7657f19
Merge pull request #2364 from urbanrotnik/ur-sci-4219 
Fix too long line problem[SCI-4219]
 2020-01-30 13:07:01 +01:00
Urban Rotnik 2007524365
Merge pull request #2352 from urbanrotnik/ur-sci-4272-multiple-checklist-items-fix 
Fix for items with newline [SCI-4272]
 2020-01-30 13:05:41 +01:00
Urban Rotnik d069173ad7
Merge pull request #2371 from urbanrotnik/ur-sci-4178 
Fix attachments sorting [SCI-4178]
 2020-01-30 11:29:45 +01:00
Urban Rotnik 2863a67dc5
Merge pull request #2380 from urbanrotnik/ur-sci-4302-delimiter 
Fix delimiter dropdown selection [SCI-4302]
 2020-01-30 11:27:49 +01:00
Urban Rotnik 15f0d41b14 Fix delimiter dropdown selection 2020-01-30 09:26:00 +01:00
aignatov-bio 2c595d01fc
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters 
Small fixes
 2020-01-29 15:48:19 +01:00
Mojca Lorber 9388883479 Fix scroll position on protocol and result page 2020-01-29 14:28:52 +01:00
Urban Rotnik fc14bf05be
Merge pull request #2377 from biosistemika/master 
Master >> Develop
 2020-01-29 14:25:11 +01:00
Miha Mencin 05b9a36c45
Bump version to 1.18.1 2020-01-29 11:48:16 +01:00
Urban Rotnik 48cd901334
Merge pull request #2376 from biosistemika/release/1.18.1 
Release/1.18.1
 2020-01-29 11:46:23 +01:00
aignatov-bio 970463f34d Fix input fields 2020-01-29 11:41:47 +01:00
aignatov-bio 470f39ce04 Fix scrollbar 2020-01-29 11:14:25 +01:00
aignatov-bio 3c9bed4b56 Fix markup 2020-01-29 11:03:25 +01:00
aignatov-bio 4aa0a79c02 Fix resize repository 2020-01-29 11:00:48 +01:00
Urban Rotnik 9a4f0ab9f2
Merge pull request #2375 from urbanrotnik/ur-sci-status-item-emoji-fix 
Status item emoji fix
 2020-01-29 09:39:20 +01:00
Urban Rotnik 6c7a88475e Fix icon selection 2020-01-29 09:36:21 +01:00
Miha Mencin 7c4d842b97
Merge pull request #2374 from biosistemika/revert-2372-ml-sci-4306 
Revert "Fix repository data time range column width [SCI-4306]"
 2020-01-28 16:26:09 +01:00
Miha Mencin 94cce6d57e
Revert "Fix repository data time range column width [SCI-4306]" 2020-01-28 16:25:21 +01:00
Mojca Lorber f502408e07 Fix buttons style 2020-01-28 15:30:57 +01:00
mlorb 1015ec40fe
Merge pull request #2372 from mlorb/ml-sci-4306 
Fix repository data time range column width [SCI-4306]
 2020-01-28 15:15:00 +01:00
Mojca Lorber 1a834c206b Fix repository data time range column width 2020-01-28 15:12:09 +01:00
Urban Rotnik d974ff57e1 Fix attachments sorting 2020-01-28 15:01:20 +01:00
Urban Rotnik 358a0b89ce
Merge pull request #2369 from urbanrotnik/release/1.18.1 
Safe navigation for serializer value of RepositoryListItem [SCI-4308]
 2020-01-28 14:28:59 +01:00
aignatov-bio 0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +01:00
aignatov-bio cd9a89a586
Merge pull request #2356 from aignatov-bio/ai-sci-demodulize-column-name-in-datatable-helper 
Demodulize column name in datatable helper
 2020-01-28 13:42:04 +01:00
Urban Rotnik 13c9dd8cf6 Safe navigation for serializer value of RepositoryListItem 2020-01-28 13:38:37 +01:00
Urban Rotnik 6c50b514f3 Put Academy icon back, resize team switch 2020-01-27 17:15:22 +01:00
Urban Rotnik 83f4344bb7
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage 
Hide Edit/Delete buttons if user do not has permissions
 2020-01-27 16:35:07 +01:00
Miha Mencin 7ec874596d
Merge pull request #2362 from biosistemika/SCI-4300-dropdowns-in-shared-inventories 
SCI-4300 skip permission checks for list
 2020-01-27 15:25:32 +01:00
Miha Mencin 0d3e8ac3e1 remove silly test 2020-01-27 15:04:53 +01:00
Urban Rotnik 71a8a8655f Remove Academy icon 2020-01-27 14:52:19 +01:00
Urban Rotnik dc79174160 Make less opacity when editing or adding row 2020-01-27 14:39:45 +01:00
Miha Mencin 81023f8c69 SCI-4300 sckip permission checking for list 2020-01-27 14:27:46 +01:00
mlorb f605c0def3
Merge pull request #2358 from mlorb/ml-sci-4275 
Change to new style checkboxes on share inventory modal [SCI-4275]
 2020-01-27 13:38:30 +01:00
Mojca Lorber 276df8c151 Fix Safari inventories bug 2020-01-27 10:20:49 +01:00
Urban Rotnik 76ef468484
Merge pull request #2361 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage 
Hide Edit/Delete buttons if user do not has permissions [SCI-4298]
 2020-01-27 08:46:09 +01:00
Urban Rotnik a13a92c967
Merge pull request #2360 from urbanrotnik/ur-sci-4298-hide-edit-delete-buttons 
DIsable edit/delete buttons for repository item, communicate read-only [SCI-4297] [SCI-4305]
 2020-01-27 08:45:53 +01:00
Urban Rotnik d7761622ba Hide Edit/Delete buttons if user do not has permissions 2020-01-25 12:36:36 +01:00
Urban Rotnik 503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik 0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00
Urban Rotnik ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Mojca Lorber 3af2f4af19 Change to new style checkboxes on share inventory modal 2020-01-24 15:43:13 +01:00
aignatov-bio 9524659e1d Demodulize column name in datatable helper 2020-01-24 11:33:30 +01:00
Urban Rotnik 8d7f51edde Fix for items with newline 2020-01-22 13:15:29 +01:00
Urban Rotnik 1531a2f47e Structure.sql fix 2020-01-22 12:25:07 +01:00
Urban Rotnik 0a2970c18d Fix import for old activities 2020-01-22 12:24:56 +01:00