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

7291 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mojca Lorber b938c6ce35 Fix css for icons for repository file type 2020-01-28 11:32:48 +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
Mojca Lorber e6043ee0e5 Fix checklist list in inventory table 2020-01-27 15:52:52 +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
Mojca Lorber 9cf77e0551 Fix hound 2020-01-24 13:35:29 +01:00
Miha Mencin f5aee0319e
Set default to 'peer' 2020-01-24 13:33:08 +01:00
Mojca Lorber f5d245e7cc Sidebar redesign 2020-01-24 13:22:04 +01:00
aignatov-bio 9524659e1d Demodulize column name in datatable helper 2020-01-24 11:33:30 +01:00
Miha Mencin baac15c0ff
fix codestyle 2020-01-23 22:06:14 +01:00
Miha Mencin 20c5d7b5f7 SCI-3403 read openssl-verify-mode from env variable 2020-01-23 21:51:38 +01:00
aignatov-bio 24b296fd86 Fix duplicate tags and small css issues 2020-01-23 13:38:02 +01:00
aignatov-bio 4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +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
Miha Mencin 498003555e
Bump version to 1.18.0 2020-01-22 11:24:35 +01:00
Miha Mencin 2a62a83530
Merge pull request #2350 from biosistemika/develop 
Develop to Master
 2020-01-22 11:23:26 +01:00
Miha Mencin 9e4ae525e6
Merge pull request #2349 from mlorb/ml-sci-4280 
Change button [SCI-4280]
 2020-01-22 08:57:20 +01:00
Mojca Lorber 658b64b617 Change button 2020-01-21 17:21:49 +01:00
Alex Kriuchykhin 262a992ad6
Merge pull request #2348 from okriuchykhin/aignatov-bio-ai-sci-4268-new-emoji-picker 
Update emoji png icons
 2020-01-21 16:35:41 +01:00
Oleksii Kriuchykhin 2e2fe5e155 Update emoji png icons 2020-01-21 16:36:29 +01:00
aignatov-bio 79d71f1e9b
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker 
Add new emoji picker [SCI-4268]
 2020-01-21 16:33:05 +01:00
mlorb 97c6ee7d2e
Merge pull request #2347 from mlorb/ml-sci-4271 
Fix alerts style [SCI-4271]
 2020-01-21 16:31:06 +01:00
aignatov-bio 5a4d74d487 Update emoji picker image loading 2020-01-21 15:49:13 +01:00
Mojca Lorber 981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
mlorb ee609890ef
Merge pull request #2344 from mlorb/ml-sci-4138 
Fix constants for email redesign [SCI-4138]
 2020-01-21 15:02:26 +01:00