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 |
|
aignatov-bio
|
56ff4e7702
|
Add new statuses to dashboard
|
2020-08-10 09:10:56 +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 |
|
Oleksii Kriuchykhin
|
02a4da1a55
|
Add task status to export all [SCI-4829]
|
2020-08-06 10:50:11 +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 |
|
Alex Kriuchykhin
|
81941fae5a
|
Merge pull request #2768 from biosistemika/develop_to_task_flows
Develop into TaskFlows
|
2020-08-05 14:16:11 +02:00 |
|
Oleksii Kriuchykhin
|
6a50f7f27e
|
Improve handling of old repository table states [SCI-4889]
|
2020-08-05 13:15:38 +02:00 |
|
Oleksii Kriuchykhin
|
ce8d12e1c4
|
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-08-05 09:59:58 +02:00 |
|
Urban Rotnik
|
073979534c
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 16:43:05 +02:00 |
|
Urban Rotnik
|
e221d960e7
|
Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard"
This reverts commit 8b6d57058c, reversing
changes made to 957ac92669.
|
2020-08-04 15:07:22 +02:00 |
|
Urban Rotnik
|
7c14da70d9
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 14:50:46 +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
|
e965844a9e
|
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports
Add new statuses to reports [SCI-4837]
|
2020-08-04 09:49:55 +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
|
a9bc5b664a
|
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal
Add modal for status flow [SCI-4835]
|
2020-08-04 09:47:40 +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
|
8b6d57058c
|
Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard
Add statuses to dashboard current task filters [SCI-4899]
|
2020-08-03 11:54: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 |
|
aignatov-bio
|
536367362c
|
Add statuses to dashboard filters
|
2020-07-31 10:59:10 +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 |
|
aignatov-bio
|
f09ead703c
|
Fix markup
|
2020-07-28 09:54:47 +02:00 |
|
aignatov-bio
|
b644950e4e
|
Fix I18n markup
|
2020-07-28 09:53:35 +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
|
68fc6ec58a
|
Add sorting my module statuses
|
2020-07-27 16:36:21 +02:00 |
|
aignatov-bio
|
968249c6d8
|
Fix tests
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
9f7efe6068
|
Add backend for status flow show
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
6bd12e0397
|
Add modal for status flow
|
2020-07-27 13:48:21 +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 |
|
Oleksii Kriuchykhin
|
7bedbd3511
|
Fix canvas update method [SCI-4817]
|
2020-07-24 18:38:53 +02:00 |
|
Oleksii Kriuchykhin
|
94588e4698
|
Refactor task archive and move permissions [SCI-4817]
|
2020-07-24 17:00:42 +02:00 |
|