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
8708 commits 70 branches 179 tags 165 MiB
Commit graph

590 commits

Author SHA1 Message Date
aignatov-bio 503d19fb90 Add snapshots to team export/import 2020-06-03 17:02:33 +02:00
Mojca Lorber c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio 8f998ceee9 Fix counter 2020-05-27 16:11:10 +02:00
aignatov-bio 40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Urban Rotnik c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report 
Show snapshot in report [SCI-4622]
 2020-05-25 14:21:49 +02:00
Urban Rotnik 2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
aignatov-bio f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber 40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
Alex Kriuchykhin afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629 
Prevent the inventory items editing while snapshot is being created [SCI-4629]
 2020-05-19 10:10:34 +02:00
Oleksii Kriuchykhin d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik 3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio d3faec1070 Rename service 2020-05-08 12:28:37 +02:00
aignatov-bio c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio 29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin 0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552 
Implement background processing of repository snapshots [SCI-4552]
 2020-04-29 12:03:23 +02:00
aignatov-bio 046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
Urban Rotnik 9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio d48997464d Fix markup 2020-04-23 15:25:28 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio 10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Urban Rotnik 89b848d21d Fix value rounding for General excel type 2020-04-23 07:19:24 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
Alex Kriuchykhin 436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516 
Add repository snapshots with service, refactor item assigning [SCI-4516]
 2020-04-15 17:32:25 +02:00
Oleksii Kriuchykhin 837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin 3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
aignatov-bio 4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
aignatov-bio d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
aignatov-bio a32a3db8e5 Split joins scope 2020-03-11 14:30:41 +01:00
aignatov-bio c13721f842 Fix recent work service and move templates to html 2020-03-11 11:34:59 +01:00
aignatov-bio 63a5459d21 Add error handling to create task modal 2020-03-10 13:16:56 +01:00
aignatov-bio 180b736769 Refactor recent work service 2020-03-09 15:10:51 +01:00
aignatov-bio 5ee406606a Add checks for archived projects and experiments 2020-03-06 15:48:54 +01:00
aignatov-bio 193c4974d2 Add user time zone 2020-03-06 15:24:57 +01:00
aignatov-bio b89cc1745a Add users scope 2020-03-06 15:12:40 +01:00
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
Mojca Lorber 8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio 294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio 3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio 32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
Alex Kriuchykhin 9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220 
Extend inventory import to support new data types [SCI-4220]
 2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin 6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Mojca Lorber 2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin 632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Urban Rotnik 0991a26ee8
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import 
Fix import for old activities [SCI-4211]
 2020-01-30 13:08:33 +01:00
Urban Rotnik 503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Urban Rotnik 0a2970c18d Fix import for old activities 2020-01-22 12:24:56 +01:00
Mojca Lorber 404805bef5 Fix constants for email redesign 2020-01-21 09:38:08 +01:00
Oleksii Kriuchykhin 7d8ba7cb32 Fix clonning of date time values [SCI-4204] 2020-01-16 16:03:13 +01:00
Urban Rotnik 507443ba38 Add custom method for repository report JSON data 2020-01-16 14:42:26 +01:00
Alex Kriuchykhin da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204 
Refactor repository cell cloning to support all data types [SCI-4204]
 2020-01-15 13:04:50 +01:00
Alex Kriuchykhin 9412cccc9c
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update 
Fix for list items update
 2020-01-15 12:34:33 +01:00
Urban Rotnik 97954b3930 fixup! Fix list item update 2020-01-15 11:28:31 +01:00
Urban Rotnik a23b2eab78 Fix list item update 2020-01-15 11:24:50 +01:00
Oleksii Kriuchykhin 9e8bd23616 Merge latest branch 'develop' into ok_SCI_3988 2020-01-15 10:52:20 +01:00
Urban Rotnik bcce8235cc Add rescue block for setting default repository state 2020-01-14 23:49:02 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin 01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Urban Rotnik 9296f0eb4f Add extra format for exports 2020-01-10 11:09:30 +01:00
Oleksii Kriuchykhin 2faab14444 Fix repository table state updates after column creation/deletion [SCI-4196] 2020-01-08 16:16:54 +01:00
Oleksii Kriuchykhin 522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Alex Kriuchykhin 1e665804ab
Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export 
Add new column types to team export/import [SCI-4155]
 2020-01-07 15:47:09 +01:00
Oleksii Kriuchykhin 1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +01:00
Oleksii Kriuchykhin 4df8779b19 Fix experiment template exporter [SCI-3988] 2020-01-07 15:26:21 +01:00
aignatov-bio a69e587706 Change cells loading in report repository helper 2020-01-07 14:21:55 +01:00
aignatov-bio 10b7aad732 Add ned column types to team export/import 2020-01-07 14:12:48 +01:00
aignatov-bio 4895f41238 Add helper for repository tables in docx report 2020-01-06 12:40:09 +01:00
aignatov-bio 3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model 
Refactor checklist column data structure [SCI-4168]
 2019-12-24 11:12:36 +01:00
aignatov-bio 210292de07 Leave string_agg only for checklists 2019-12-23 21:36:56 +01:00
Urban Rotnik c286334c1d UpdateRepositoryRowService fix 2019-12-23 14:53:51 +01:00
aignatov-bio 725bb449d5 Fix naming 2019-12-23 09:20:36 +01:00
aignatov-bio 54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio 16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +01:00
Alex Kriuchykhin 0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166 
Add view/edit renderers for numeric data type [SCI-4166]
 2019-12-19 11:57:13 +01:00
aignatov-bio dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Urban Rotnik 7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
aignatov-bio 7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Urban Rotnik d35f7119b7 Moved delete action to service 2019-12-10 14:29:37 +01:00
Urban Rotnik dd9880f030 Add CreateRepositoryRowService 2019-12-10 14:29:34 +01:00
Urban Rotnik 98b89e9e80 Add UpdateRepositoryRowService 2019-12-10 14:29:34 +01:00
aignatov-bio 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Miha Mencin 80579043b2 Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7 2019-12-03 09:10:09 +01:00
Alex Kriuchykhin fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098 
Refactor Azure configuration  and connected accounts [SCI-4098]
 2019-11-29 11:30:33 +01:00
Urban Rotnik f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik 9bf948c3a8 Add statuses validation on FE 2019-11-29 10:19:11 +01:00
Urban Rotnik b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Urban Rotnik b2b6296cb5 Improve update items action, JS and views 2019-11-29 10:19:10 +01:00
Urban Rotnik 804e36650e Add service for updating ListColumnItems 2019-11-29 10:19:09 +01:00
Oleksii Kriuchykhin 3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin 73be1181ac Fix failing tests for repository states [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin 338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Urban Rotnik f645ff52ab Refactor ColumnServices 2019-11-29 10:17:52 +01:00
Urban Rotnik 1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +01:00
Urban Rotnik 43e81c46b7 Rename CreateColumnService to ColumnService 2019-11-29 10:16:46 +01:00
Urban Rotnik b55966487e Remove permission helper 2019-11-29 10:16:46 +01:00
Urban Rotnik 14b43d516e Add UpdateStatusColumnService service 2019-11-29 10:16:45 +01:00
Urban Rotnik de2ee66dd4 Add DeleteStatusColumnService service 2019-11-29 10:16:44 +01:00
Urban Rotnik 5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
Urban Rotnik bbb8c46fe2 Add CreateStatusColumnService service 2019-11-29 10:16:44 +01:00
Mojca Lorber dda5ffe4f9 Add create repository column service 2019-11-29 10:16:43 +01:00
aignatov-bio 3d9351c537 Update filter logic for activities 2019-11-27 13:13:19 +01:00
Oleksii Kriuchykhin 6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Miha Mencin 72c158d3e2 SCI-4108 check if there are any checklist items before rendering the checklist 2019-11-25 11:55:02 +01:00
Oleksii Kriuchykhin 5e8afae1f0 Fix failing tests [SCI-3988] 2019-11-18 15:15:44 +01:00
Oleksii Kriuchykhin b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
Alex Kriuchykhin 8b665d4f1c
Merge pull request #2193 from okriuchykhin/ok_SCI_4028 
Fix reports in team importer [SCI-4028]
 2019-11-13 13:10:15 +01:00
aignatov-bio e4a39bbbe4 Add check for files 2019-11-06 14:41:51 +01:00
aignatov-bio b56a997aef Fix team import for user with avatars 2019-11-04 14:53:59 +01:00
Oleksii Kriuchykhin 1e748f2d7e Fix reports in team importer [SCI-4028] 2019-10-30 15:47:11 +01:00
Oleksii Kriuchykhin 6c57f56bf4 Fix issue with empty cells for xlsx inventory imports [SCI-4003] 2019-10-21 12:06:45 +02:00
Miha Mencin 0af8629f98 SCI-3994 fix for excel import 2019-10-17 14:37:11 +02:00
Miha Mencin c673c3960f removin uneeded stuff left there by supidity 2019-10-08 17:23:46 +02:00
Miha Mencin 4f290cacfc remove the unneeded require 2019-10-08 16:22:48 +02:00
Miha Mencin de89a97e0a Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export 2019-10-08 16:20:40 +02:00
Miha Mencin 5f16926280 SCI-3976 different approach to file download 2019-10-08 16:20:16 +02:00
Oleksii Kriuchykhin 6908a5c3a3 Fix team deletion script [SCI-3960] 2019-10-08 12:04:47 +02:00
Alex Kriuchykhin 076d61d4d0
Merge pull request #2116 from okriuchykhin/ok_SCI_3908 
Remove Paperclip from the codebase [SCI-3908]
 2019-10-04 14:45:42 +02:00
Oleksii Kriuchykhin 9d2ac4179e Fix failing tests [SCI-3908] 2019-10-04 13:02:18 +02:00
Urban Rotnik 81d66ceedd Add CustomDisk Service for ActiveStorage 2019-10-03 13:16:15 +02:00
Oleksii Kriuchykhin 260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Urban Rotnik e2a779ccfe Activestorage fix for disk storage 
[SCI-3947]
 2019-10-02 14:01:38 +02:00
Anton Ignatov b382eb607b Fix docx report for active storage 2019-10-01 10:26:24 +02:00
Anton Ignatov 99005cf22e Fix tests for repository row importer 2019-09-30 16:27:45 +02:00
aignatov-bio 856e876b61
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy 
Fix error on task copy [SCI-3900]
 2019-09-24 14:16:38 +02:00
Anton Ignatov 646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Anton Ignatov 09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Alex Kriuchykhin 29ffe05442
Merge pull request #1964 from okriuchykhin/ok_SCI_3643 
Add text extraction from MarvinJS for search [SCI-3643]
 2019-09-18 16:22:11 +02:00
Anton Ignatov b9f6b3a082 Fix error when save report to inventory 2019-09-18 12:50:54 +02:00
Oleksii Kriuchykhin e12cd0ae9d Fix autoloading issues [SCI-3881] 2019-09-17 10:50:01 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Alex Kriuchykhin 0d6f011e61
Merge pull request #2006 from okriuchykhin/ok_SCI_3765 
Add path method to custom ActiveStorage S3 service [SCI-3765]
 2019-09-12 15:34:03 +02:00
aignatov-bio a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00