scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
9501 commits 70 branches 179 tags 165 MiB
Commit graph

667 commits

Author SHA1 Message Date
aignatov-bio 0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
Alex Kriuchykhin 962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317 
Add project permissions check to projects toolbar [SCI-5317]
 2021-01-07 13:25:34 +01:00
aignatov-bio 1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin 9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
aignatov-bio f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
Oleksii Kriuchykhin 1c27b99ba5 Add default sorting to ProjectsOverviewService [SCI-5361] 2021-01-04 22:37:25 +01:00
Urban Rotnik a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link 
Add 'archived' to smart annotation for repository item [SCI-5283]
 2021-01-04 11:53:47 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Urban Rotnik 4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik 7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik 7c967d32f1 Reset invalid state 
SCI-5306
 2020-12-18 09:46:05 +01:00
Urban Rotnik 63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik 87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Miha Mencin 6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268 
Archiving: add 'archived' flag on folder [SCI-5268]
 2020-12-17 13:13:26 +01:00
Oleksii Kriuchykhin f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin 0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Urban Rotnik a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
Oleksii Kriuchykhin 78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio 8245f18076 Add h6 render to docx report 2020-11-27 13:33:44 +01:00
Oleksii Kriuchykhin 1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
Urban Rotnik e3f9087600 Fix search 2020-11-25 19:33:12 +01:00
Urban Rotnik 5717e37f2b Remove obsolete code, fix tests 2020-11-25 18:34:46 +01:00
Urban Rotnik afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin 0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Alex Kriuchykhin 1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136 
Implement search endpoint for Projects & folders search [SCI-5136]
 2020-11-23 13:09:33 +01:00
aignatov-bio e4e5fc8474
Merge pull request #2944 from aignatov-bio/ai-sci-5058-fix-smart-annotation-for-archived-projects 
Fix smart annotation for archived experiments [SCI-5058]
 2020-11-19 11:18:26 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio 80d6e5e87c Add project folders to team import/export 2020-11-13 14:13:26 +01:00
aignatov-bio 7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
aignatov-bio f3dd749c1d Fix smart annotation for archived experiments 2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin f2f08a31d5 Add check for zero page size in repository states [SCI-5190] 2020-11-06 11:42:33 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
Urban Rotnik 1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Urban Rotnik f5118e5461
Merge pull request #2901 from okriuchykhin/ok_SCI_5063 
Refactor experiment workflow image generation [SCI-5063]
 2020-10-29 13:55:23 +01:00
Urban Rotnik c6a891bcea
Merge pull request #2912 from urbanrotnik/ur-sci-5091 
Add current team to smart annotations permission check [SCI-5091]
 2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik 25d050cec4 Add current team to smar annotations permission check 2020-10-29 12:17:40 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
Urban Rotnik c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
Urban Rotnik a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
Urban Rotnik e748e1eff3 Fix smart annotations and links styling 2020-10-14 17:58:07 +02:00
Urban Rotnik a19e0ef846 Refactor 2020-10-13 14:23:39 +02:00
Urban Rotnik 1b860afe30 Move TinyMCE parser to separate class 2020-10-13 09:45:13 +02:00
Urban Rotnik ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
Urban Rotnik 274293348e Clean up 2020-10-09 09:53:27 +02:00
Urban Rotnik dfca798e2d Refactored tiny_mce_table parser and renderer 2020-10-09 09:43:36 +02:00
Urban Rotnik 92b4d95c72 Implement lists in DOCX 2020-10-09 09:43:00 +02:00
aignatov-bio 9da27956d3
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects 
Show smart annotation for archived projects/experiments [SCI-4987]
 2020-09-24 13:29:49 +02:00
aignatov-bio 653fe6fb1d Fix markup 2020-09-24 11:56:17 +02:00
Urban Rotnik 3bda6a987d Fix smart annotation for RepositoryItem 2020-09-24 11:45:03 +02:00
aignatov-bio fde33e6e63 Fix tests 2020-09-21 14:41:51 +02:00
aignatov-bio 545e13304a Show smart annotation for archived projects/experiments 2020-09-21 14:09:11 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
Urban Rotnik 9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 8b0b296b90
Merge pull request #2774 from okriuchykhin/ok_SCI_4829 
Add task status to export all [SCI-4829]
 2020-08-31 11:13:44 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Oleksii Kriuchykhin e0f7e181f6 Fix user deletion script [SCI-4829] 2020-08-21 13:12:14 +02:00
Oleksii Kriuchykhin e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +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
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
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 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +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 b644950e4e Fix I18n markup 2020-07-28 09:53:35 +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
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
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