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 |
|
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 |
|
Urban Rotnik
|
868f2e8242
|
Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab
Fix CSS for activities on task page [SCI-4878]
|
2020-08-03 11:31:47 +02:00 |
|
Urban Rotnik
|
ac3c06d882
|
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
|
2020-08-03 11:30:31 +02:00 |
|
dependabot[bot]
|
ee2a9dd408
|
Bump elliptic from 6.4.1 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-07-30 15:04:57 +00:00 |
|
aignatov-bio
|
73911cf7ce
|
Fix CSS for activities on task page
|
2020-07-30 13:30:23 +02:00 |
|
aignatov-bio
|
2f5231e832
|
Add start date to current task dashboard filter
|
2020-07-29 16:09:23 +02:00 |
|
aignatov-bio
|
109823f764
|
Fix tests
|
2020-07-29 11:44:52 +02:00 |
|
aignatov-bio
|
15b5f9bb68
|
Add ordering for result page
|
2020-07-28 15:39:29 +02:00 |
|
aignatov-bio
|
234e1c3e99
|
Fix tests
|
2020-07-28 10:26:23 +02:00 |
|
aignatov-bio
|
3a9d97e85e
|
Merge pull request #2756 from aignatov-bio/ai-sci-4891-add-2fa-after-forgot-password
Redirect to sign in after recover password [SCI-4891]
|
2020-07-28 09:57:09 +02:00 |
|
Oleksii Kriuchykhin
|
60017661c1
|
Fix import of the old format TinyMCE images [SCI-4767]
|
2020-07-27 16:39:39 +02:00 |
|
aignatov-bio
|
33e3e3d301
|
Small 2fa fixes
|
2020-07-27 13:42:51 +02:00 |
|
Oleksii Kriuchykhin
|
1a8333612a
|
Merge branch 'features/pwa' into develop
|
2020-07-27 09:47:41 +02:00 |
|
Urban Rotnik
|
4d2169c916
|
Merge pull request #2758 from urbanrotnik/ur-sci-4750
Fix task error [SCI-4750]
|
2020-07-24 15:26:56 +02:00 |
|
Urban Rotnik
|
9c05da1071
|
Fix task error
|
2020-07-24 15:25:29 +02:00 |
|
Urban Rotnik
|
4958139699
|
Extend asset API upload to support base64
|
2020-07-24 14:57:03 +02:00 |
|
aignatov-bio
|
d044f7616b
|
Redirect to sign in after recover password
|
2020-07-23 15:48:51 +02:00 |
|
Alex Kriuchykhin
|
8b24a0f704
|
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error
Add blacklist for dashboard activities [SCI-4730]
|
2020-07-23 15:21:51 +02:00 |
|
Alex Kriuchykhin
|
26cfa001c8
|
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
Add test for canvas_controller [SCI-4769]
|
2020-07-23 15:18:01 +02:00 |
|
Alex Kriuchykhin
|
d4408f6af7
|
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
|
2020-07-23 14:45:10 +02:00 |
|
aignatov-bio
|
ac1915351d
|
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx
Add scopes and permission checks for docx report [SCI-4886]
|
2020-07-23 14:26:53 +02:00 |
|
Urban Rotnik
|
9bcf1a5df5
|
Add blacklist for dashboard activities
|
2020-07-23 14:22:58 +02:00 |
|
Urban Rotnik
|
aecd6b228b
|
Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte
Increase chars limit for RTE [SCI-4764]
|
2020-07-23 12:58:36 +02:00 |
|
Urban Rotnik
|
077f5eefdb
|
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value
Fix undefined text cell [SCI-4890]
|
2020-07-23 12:56:43 +02:00 |
|
aignatov-bio
|
04a6a2a250
|
Small fixes
|
2020-07-23 11:35:22 +02:00 |
|
Alex Kriuchykhin
|
cb9fe04584
|
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters
Fix global activities filters [SCI-4785]
|
2020-07-23 10:09:36 +02:00 |
|
Alex Kriuchykhin
|
560f6e2c91
|
Merge pull request #2739 from biosistemika/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.13 to 4.17.19
|
2020-07-23 10:05:55 +02:00 |
|
aignatov-bio
|
b214d2df77
|
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch
Fix switch view margins [SCI-4815]
|
2020-07-23 08:57:20 +02:00 |
|
Urban Rotnik
|
51ca828399
|
Fix undefined text cell
|
2020-07-22 17:27:36 +02:00 |
|
aignatov-bio
|
218096473a
|
Merge pull request #2752 from aignatov-bio/develop
Merge TinyMCE feature
|
2020-07-22 14:21:25 +02:00 |
|