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

7825 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
aignatov-bio 1a5f32bd94
Merge pull request #2692 from aignatov-bio/ai-sci-4754-enable-2fa-button-in-settings 
Add enable 2fa button to user settings [SCI-4754]
 2020-06-29 15:11:45 +02:00
Urban Rotnik 63365d2026
Merge pull request #2688 from urbanrotnik/ur-sci-4752 
Add 2fa fields to user [SCI-4752]
 2020-06-29 11:41:01 +02:00
aignatov-bio fe79fa4788 Fix markup 2020-06-29 10:57:41 +02:00
aignatov-bio 6fa97d3639 Add enable 2fa button to user settings 2020-06-29 10:56:06 +02:00
Urban Rotnik de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Urban Rotnik 88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Miha Mencin a437e09085
Merge pull request #2669 from biosistemika/release/1.19.3-hotfix 
Release/1.19.3 hotfix
 2020-06-18 12:51:19 +02:00
Miha Mencin e87ef08983
Bump version to 1.9.3 2020-06-18 12:46:52 +02:00
aignatov-bio d0f0baf6b2
Merge pull request #2664 from urbanrotnik/ur-sci-4762-v2 
Canvas fix [SCI-4762] -v2
 2020-06-17 13:01:40 +02:00
Urban Rotnik 41c1230db1 Remove position check from contorller 2020-06-17 11:55:43 +02:00
Urban Rotnik c0a2d4709c
Merge pull request #2662 from urbanrotnik/ai-sci-4770 
Fix MarvinJS modal header [SCI-4770] - HotFix
 2020-06-16 11:44:04 +02:00
aignatov-bio 95ae8215a7 Fix MarvinJS modal header 2020-06-16 10:28:43 +02:00
Urban Rotnik 481516260f
Merge pull request #2658 from urbanrotnik/ur-sci-4762-canvas-errors 
Fix update_canvas [SCI-4762]
 2020-06-15 11:59:26 +02:00
Urban Rotnik 15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
Urban Rotnik ec14cf9fef
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2 
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
 2020-06-12 11:41:02 +02:00
Urban Rotnik 800465f9a9
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using 
Not include marvinJS library, if marvinJS disabled [SCI-4733]
 2020-06-12 11:40:41 +02:00
aignatov-bio 97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
Urban Rotnik 84aacecb81
Bump version to 1.19.2 2020-06-11 15:34:10 +02:00
Urban Rotnik 8928d5ef4e
Merge pull request #2654 from urbanrotnik/ur-ml-sci-4737-cp 
Fix protocol duplication at saving protocol from task to repository [SCI-4737]
 2020-06-11 15:33:16 +02:00
Urban Rotnik 566a800656
Revert bump to 1.19.2 2020-06-11 15:31:55 +02:00
Miha Mencin 12e48d1f7a
Bump version to 1.9.2 2020-06-11 13:25:56 +02:00
Mojca Lorber cfeb4b4d3d Fix protocol duplication at saving protocol from task to repository 2020-06-11 13:19:21 +02:00
aignatov-bio 15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Urban Rotnik 494c707cca
Merge pull request #2641 from biosistemika/develop 
Develop to Master
 2020-06-04 13:36:05 +02:00
Miha Mencin 17306eb585
Bump version to 1.19.1 2020-06-04 12:58:56 +02:00
Alex Kriuchykhin c8e8b8e2f3
Merge pull request #2640 from okriuchykhin/ok_SCI_4728 
Fix appearance of snapshots from another my_module in report [SCI-4728]
 2020-06-04 09:50:43 +02:00
Oleksii Kriuchykhin f1f26587c0 Fix appearence of snapshots from another my_module in report [SCI-4728] 2020-06-04 09:42:22 +02:00
Miha Mencin 38877aad26
Merge pull request #2639 from urbanrotnik/ur-sci-4728 
Scope snapshots to project [SCI-4728]
 2020-06-03 23:40:14 +02:00
Urban Rotnik a93e2a5d6f Remove select 2020-06-03 23:18:22 +02:00
Urban Rotnik 69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
Miha Mencin 4a1a957cda
Merge pull request #2637 from aignatov-bio/ai-sci-4726-add-snapshots-to-team-export-import 
Add snapshots to team export/import [SCI-4726]
 2020-06-03 21:17:25 +02:00
aignatov-bio 4886d95ad5 Fix variable naming 2020-06-03 17:07:11 +02:00
aignatov-bio 503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +02:00
Miha Mencin 1a5c8c104a
Merge pull request #2635 from urbanrotnik/ur-sci-4724-fix-report-default-snapshot 
Fix for default snapshot in report [SCI-4724]
 2020-06-03 13:06:34 +02:00
Urban Rotnik 50bc313853 Fix for default snapshot in report 2020-06-03 10:49:45 +02:00
Urban Rotnik 21e048c52e
Merge pull request #2633 from urbanrotnik/ur-sci-fix-manage-column-dropdown 
Fix dropdown render for columns manage modal [SCI-4720]
 2020-06-02 15:44:25 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Miha Mencin ca669263bf
Merge pull request #2634 from aignatov-bio/ai-sci-4719-fix-owner-team-for-snapshots 
Fix owner team for snapshots [SCI-4719]
 2020-06-02 12:05:04 +02:00
aignatov-bio f986a0ed56 Fix owner team for snapshots 2020-06-02 11:40:30 +02:00
Miha Mencin d89dce9f72
Merge pull request #2632 from okriuchykhin/ok_SCI_4715 
Remove inventory links of unshared inventory [SCI-4715]
 2020-06-02 10:46:33 +02:00
Urban Rotnik 9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
Urban Rotnik 4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +02:00
Oleksii Kriuchykhin 6afebdc5da Remove inventory links of unshared inventory [SCI-4715] 2020-06-01 17:50:31 +02:00
mlorb 26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529 
Add rename task and rename experiment activities [SCI-4529]
 2020-06-01 12:58:36 +02:00
aignatov-bio 4d6282510d
Merge pull request #2629 from aignatov-bio/ai-sci-4599-fix-ordering-for-projects-in-sidebar 
Fixed projects ordering in sidebar on team page [SCI-4599]
 2020-06-01 11:19:29 +02:00
aignatov-bio 2269299b61 Fixed projects ordering in sidebar on team page 2020-06-01 10:55:23 +02:00
aignatov-bio 7c8460dcf5
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness 
Change selected line thickness [SCI-4699]
 2020-06-01 10:43:46 +02:00
aignatov-bio 222e89ea8d Change selected line thickness 2020-06-01 10:30:06 +02:00
aignatov-bio 8f3c7fa9aa
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon 
Fix shared inventory icon [SCI-4549]
 2020-06-01 10:28:07 +02:00