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

8181 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 7fd588b104
Merge pull request #2801 from biosistemika/hotfix/1.19.6 
Hotfix 1.19.6 to Master
 2020-08-25 14:48:34 +02:00
Urban Rotnik b22d82fd8c
Bump version to 1.19.6 2020-08-25 11:33:54 +02:00
Urban Rotnik 3e7c4e2b05 Set stateDuration to 0 2020-08-25 10:45:58 +02:00
Oleksii Kriuchykhin b2193b1fa5 Bump version to 1.19.5 2020-08-20 11:49:02 +02:00
mlorb 8859633878
Merge pull request #2794 from mlorb/ml-sci-4943 
Fix export icon [SCI-4943]
 2020-08-14 17:13:53 +02:00
Mojca Lorber faf2d4c533 Fix export icon 2020-08-14 17:02:03 +02:00
mlorb 9de057a17e
Merge pull request #2793 from aignatov-bio/ai-sci-4938-fix-checklist-ordering 
Fix for checklist ordering [SCI-4938]
 2020-08-14 13:18:27 +02:00
aignatov-bio 19a0d05467 Fix for checklist ordering 2020-08-14 12:32:39 +02:00
aignatov-bio 91e6129c38
Merge pull request #2792 from urbanrotnik/ur-sci-4935 
Update checklist item positions with validations skip [SCI-4935]
 2020-08-14 10:49:17 +02:00
Urban Rotnik 38d3411007 Update checklist item positions with validations skip 2020-08-13 20:06:03 +02:00
mlorb 02ff9b7cbd
Merge pull request #2791 from mlorb/ml-sci-4928 
Fix Collapse and expand buttons position [SCI-4928]
 2020-08-13 13:22:30 +02:00
Mojca Lorber a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio 3aa583ab68
Merge pull request #2789 from aignatov-bio/ai-sci-4927-fix-error-handling-in-invite-user-view 
Fix error handling in invite user view [SCI-4927]
 2020-08-13 12:26:28 +02:00
aignatov-bio 9474319d6b Fir error handling in invite user view 2020-08-13 11:34:21 +02:00
Urban Rotnik 0c28b5d667
Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix 
Fix activities query [SCI-4925]
 2020-08-13 10:09:45 +02:00
Urban Rotnik 9f74a86ebe Fix activities query 2020-08-12 16:56:49 +02:00
aignatov-bio 91b8475db5
Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup 
Fix error handling on registration page [SCI-4918]
 2020-08-12 09:39:21 +02:00
Urban Rotnik 88f4e468ad
Merge pull request #2785 from urbanrotnik/ur-sci-4920-permission-repository-fix-lapsus 
Fix permission check lapsus
 2020-08-11 17:04:28 +02:00
Urban Rotnik 7d186156a0 Fix permission check lapsus 2020-08-11 17:00:36 +02:00
aignatov-bio 84b99eaf3d Fix error handling on registration page 2020-08-11 15:39:35 +02:00
mlorb 02bb29cf79
Merge pull request #2772 from mlorb/ml-sci-4907 
Fix inventory card view for snapshots as default view [SCI-4907]
 2020-08-11 14:43:19 +02:00
Mojca Lorber 5d15e73866 Fix failing tests 2020-08-11 13:33:44 +02:00
Urban Rotnik f5ffd685d8
Merge pull request #2773 from urbanrotnik/ur-sci-4879-word-format-fix 
Fix word reports when using headings [SCI-4879]
 2020-08-11 13:01:43 +02:00
Mojca Lorber 7af9c387cf Fix errors 2020-08-11 10:27:23 +02:00
Mojca Lorber 94e6b554f1 Revert back the view 2020-08-10 17:29:29 +02:00
Urban Rotnik 29152eeb6d
Merge pull request #2783 from urbanrotnik/ur-sci-4920-permission-repository-fix 
Fix permission check [SCI-4920]
 2020-08-10 15:59:21 +02:00
Miha Mencin b333700f40
Merge pull request #2779 from okriuchykhin/ok_SCI_4910 
Fix rendering of RTE in API [SCI-4910]
 2020-08-10 15:26:35 +02:00
Urban Rotnik e429c78d56 Fix permission check 2020-08-10 15:22:49 +02:00
Miha Mencin 9c351dd2ed
Merge pull request #2782 from aignatov-bio/ai-sci-4902-add-cell-border-to-docx-report 
Add border to tinymce table in docx [SCI-4902]
 2020-08-10 15:02:39 +02:00
aignatov-bio 67b6592470
Merge pull request #2781 from aignatov-bio/ai-sci-4919-fix-dashboard-calendar 
Fix dashboard calendar due date selection [SCI-4919]
 2020-08-10 14:34:23 +02:00
aignatov-bio e9028961db Add border to tinymce table in docx 2020-08-10 13:47:32 +02:00
aignatov-bio a3ad8b5aab Fix dashboard calendar due date selection 2020-08-10 12:55:56 +02:00
Miha Mencin 1080ad2821
Merge pull request #2778 from okriuchykhin/ok_SCI_4911 
Add created_at and user to API Step serializer [SCI-4911]
 2020-08-10 10:27:53 +02:00
Miha Mencin 98c3721d8c
Merge pull request #2775 from urbanrotnik/ur-sci-4904-unlock-instruction 
Add check if user is locked, show link unlock instructions [SCI-4904]
 2020-08-10 10:27:06 +02:00
Miha Mencin d4254e048a
Merge pull request #2776 from urbanrotnik/ur-sci-4914-redirect-after-password-reset 
Override password reset action, sign_in user only if 2fa disabled [SCI-4914]
 2020-08-10 10:10:30 +02:00
Urban Rotnik 3c1c562e4c Override password reset action, sign_in user only if 2fa disabled 2020-08-10 09:24:15 +02:00
Oleksii Kriuchykhin 91d9f5d6ee Fix rendering of RTE in API [SCI-4910] 2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin 3d3fd1625c Add created_at and user to API Step serializer [SCI-4911] 2020-08-07 14:54:05 +02:00
Urban Rotnik 3c3a2bfb8b Add check if user is locked, show link unlock instructions 2020-08-06 15:18:20 +02:00
Miha Mencin ae013b6fa8
join two renders 2020-08-06 14:06:23 +02:00
Miha Mencin 04c294adb1
Fix the failing test: repository row should be in correct repository 2020-08-06 13:23:40 +02:00
Urban Rotnik bdf1e62f60 Fix word reports when using headings 2020-08-05 16:25:10 +02:00
Mojca Lorber 3a8fc01ff7 Fix inventory card view for snapshots as default view 2020-08-05 15:43:43 +02:00
Urban Rotnik 6853caa0c8
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes 
Small 2fa fixes [SCI-4894]
 2020-08-04 11:23:08 +02:00
Urban Rotnik cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin 0f7c8b360e
Merge pull request #2766 from biosistemika/dependabot/npm_and_yarn/elliptic-6.5.3 
Bump elliptic from 6.4.1 to 6.5.3
 2020-08-04 09:48:27 +02:00
Alex Kriuchykhin abe2243ad2
Merge pull request #2762 from okriuchykhin/ok_SCI_4767 
Fix import of the old format TinyMCE images [SCI-4767]
 2020-08-04 09:43:32 +02:00
Alex Kriuchykhin 22015beeb5
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload 
Extend asset API upload to support base64 [SCI-4813]
 2020-08-04 09:43:01 +02:00
Urban Rotnik 9b06510dcc Update PUT result file endpoint, refactor 2020-08-03 15:14:58 +02:00
Urban Rotnik aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00