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
|
5360db76be
|
Fix dropdrown selector
|
2020-08-12 14:00:10 +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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
15b5f9bb68
|
Add ordering for result page
|
2020-07-28 15:39:29 +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 |
|
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 |
|
Urban Rotnik
|
025378cd0e
|
Fix translations and JS
|
2020-07-23 15:53:46 +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 |
|
aignatov-bio
|
a0d19b5d98
|
Add new statuses to reports
|
2020-07-23 14:24:30 +02:00 |
|
Urban Rotnik
|
9bcf1a5df5
|
Add blacklist for dashboard activities
|
2020-07-23 14:22:58 +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 |
|
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 |
|
Urban Rotnik
|
6bb760c0a9
|
Remove cucumber test for complete/uncomplete step
|
2020-07-22 16:50:10 +02:00 |
|
Urban Rotnik
|
512d6f3229
|
Add actions for update status, clean old complete actions
|
2020-07-22 16:12:34 +02:00 |
|
Urban Rotnik
|
aacee14fc6
|
Add Status button
|
2020-07-22 15:30:47 +02:00 |
|
aignatov-bio
|
1d3055011f
|
Merge branch 'features/tinymce-tables' into develop
|
2020-07-22 13:41:43 +02:00 |
|
aignatov-bio
|
53d62b0310
|
Fix tests
|
2020-07-22 13:16:27 +02:00 |
|
aignatov-bio
|
005bfb2ba7
|
Fix merge conflicts
|
2020-07-22 12:37:18 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|
Alex Kriuchykhin
|
c13730ee8d
|
Merge pull request #2740 from mlorb/ml-sci-4833
Implement Status labels on a Task card [SCI-4823]
|
2020-07-22 11:32:45 +02:00 |
|
Oleksii Kriuchykhin
|
fa62b33a42
|
Add status implications checks to the permissions [SCI-4825]
|
2020-07-21 16:00:09 +02:00 |
|
aignatov-bio
|
e170917b10
|
Add scopes and permission checks for docx report
|
2020-07-21 14:11:42 +02:00 |
|
Urban Rotnik
|
3232b4d6bf
|
Add test for canvas_controller
|
2020-07-21 13:49:59 +02:00 |
|
Urban Rotnik
|
7019e42736
|
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email
Fix font size in dropdown [SCI-4816]
|
2020-07-20 15:50:10 +02:00 |
|
aignatov-bio
|
691b8ec327
|
Fix switch view margins
|
2020-07-20 15:17:24 +02:00 |
|
aignatov-bio
|
75930b99c3
|
Fix global activities filters
|
2020-07-20 15:01:00 +02:00 |
|
Alex Kriuchykhin
|
eb7fe360ff
|
Merge pull request #2729 from urbanrotnik/ur-sci-4853
Remove :not_shared permission level for TeamRepository entity [SCI-4853]
|
2020-07-20 11:49:07 +02:00 |
|
Alex Kriuchykhin
|
806f6e32eb
|
Merge pull request #2737 from mlorb/ml-sci-4838
Fix naming of filter field for repositories tables [SCI-4838]
|
2020-07-20 11:42:02 +02:00 |
|
Urban Rotnik
|
748dd7912b
|
Fix font size in dropdown
|
2020-07-20 11:36:25 +02:00 |
|
Oleksii Kriuchykhin
|
7fd004baa8
|
Prepare database structure and relations for statuses phase one [SCI-4825]
|
2020-07-17 18:04:09 +02:00 |
|
aignatov-bio
|
e69e3ea8d3
|
Add export for assigned items
|
2020-07-17 15:17:09 +02:00 |
|
Mojca Lorber
|
10e607c281
|
Implement Status labels on a Task card
|
2020-07-17 14:48:45 +02:00 |
|
aignatov-bio
|
6ceb4abfb5
|
Add constant for results limit
|
2020-07-17 11:12:39 +02:00 |
|
aignatov-bio
|
7c4bfad09b
|
Add pagination to results page
|
2020-07-16 15:47:19 +02:00 |
|
Mojca Lorber
|
9464d2753d
|
Fix naming of filter field for repositories tables
|
2020-07-15 10:52:47 +02:00 |
|
aignatov-bio
|
2aeb661be9
|
Fix markup
|
2020-07-15 09:47:29 +02:00 |
|
aignatov-bio
|
f77902f6d4
|
Add tinymce table support to docx
|
2020-07-15 09:44:25 +02:00 |
|
Mojca Lorber
|
f7083a000a
|
Add devise lockable to user
|
2020-07-14 14:49:51 +02:00 |
|