Commit graph

543 commits

Author SHA1 Message Date
Mojca Lorber
7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +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
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
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
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
aignatov-bio
e9028961db Add border to tinymce table in docx 2020-08-10 13:47:32 +02:00
Urban Rotnik
bdf1e62f60 Fix word reports when using headings 2020-08-05 16:25:10 +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
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
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
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
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
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
e170917b10 Add scopes and permission checks for docx report 2020-07-21 14:11:42 +02:00
aignatov-bio
75930b99c3 Fix global activities filters 2020-07-20 15:01:00 +02:00
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +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
Oleksii Kriuchykhin
c7fcc3f89b Fix issue with missing archived items on task page [SCI-4854] 2020-07-10 11:43:06 +02:00
mlorb
73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
2020-07-09 11:49:16 +02:00
Urban Rotnik
950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout
Improve report layout [SCI-4771]
2020-07-09 11:48:33 +02:00
mlorb
efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261
Clean up controllers for manage repository columns [SCI-4261]
2020-07-09 09:18:23 +02:00
Alex Kriuchykhin
3534d0c60f
Merge pull request #2712 from okriuchykhin/ok_SCI_4840
Fix assigned counter on inventory items assigning modal [SCI-4840]
2020-07-08 13:53:57 +02:00
Urban Rotnik
2e1d1cc210 Clean styles 2020-07-08 11:35:25 +02:00
Urban Rotnik
5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
Oleksii Kriuchykhin
482765e942 Fix assigned counter on inventory items assigning modal [SCI-4840] 2020-07-07 14:40:19 +02:00
aignatov-bio
784788e9f3 Fix smart annotation for archived items 2020-07-06 14:22:45 +02:00
Mojca Lorber
db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin
2125c8bf83
Merge pull request #2683 from mlorb/ml-sci-4742
Hide archived and not assigned items … [SCI-4742]
2020-06-24 13:47:22 +02:00
Mojca Lorber
7e645eade4 Add active scope to repository_rows in assigning servise 2020-06-24 13:22:09 +02:00
Alex Kriuchykhin
2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button
SCI-4780 replace delete button with archive button
2020-06-24 13:16:11 +02:00
Mojca Lorber
bdf959db1f Hide archived and not assigned items from the assigning screen on the task 2020-06-24 12:06:53 +02:00
Alex Kriuchykhin
8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878
Update all rows on repository archive/restore [SCI-4787]
2020-06-24 12:06:41 +02:00
Urban Rotnik
8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +02:00
miha
41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik
efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782
Include archived columns to inventories export [SCI-4782]
2020-06-23 16:51:50 +02:00
Urban Rotnik
e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik
d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +02:00
Mojca Lorber
be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
Urban Rotnik
d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
Mojca Lorber
8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber
3d59bbd50e Fix default scope bugs 2020-06-18 18:08:53 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
2020-06-18 14:07:10 +02:00
Urban Rotnik
a05be67d3a
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag
Add archived tags to assigned repository rows [SCI-4703]
2020-06-18 13:47:57 +02:00