Commit graph

8210 commits

Author SHA1 Message Date
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Miha Mencin
48915b05f4
Merge pull request #2761 from okriuchykhin/ok_SCI_4880
Fix step position adjusting on move and destroy [SCI-4880]
2020-08-27 11:29:26 +02:00
Oleksii Kriuchykhin
ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin
a206890a8c Fix step position adjusting on move and destroy [SCI-4880] 2020-08-25 15:46:21 +02:00
Urban Rotnik
742807fdbd
Merge pull request #2804 from biosistemika/hotfix/1.19.6
Hotfix/1.19.6 to develop
2020-08-25 15:00:12 +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
Urban Rotnik
86bcd9b13b
Merge pull request #2799 from urbanrotnik/ur-sci-4945-user-state-fix
Set stateDuration to 0 [SCI-4945]
2020-08-25 05:48:18 +02:00
Urban Rotnik
b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +02:00
Alex Kriuchykhin
121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-21 11:01:49 +02:00
Alex Kriuchykhin
ccf4e2a747
Merge pull request #2759 from okriuchykhin/ok_SCI_4817
Refactor task archive and move permissions [SCI-4817]
2020-08-21 11:01:05 +02:00
Alex Kriuchykhin
287f7cce79
Merge pull request #2771 from okriuchykhin/ok_SCI_4889
Improve handling of old repository table states [SCI-4889]
2020-08-21 10:59:34 +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