scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 09:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
7718 commits 69 branches 179 tags 165 MiB
Commit graph

479 commits

Author SHA1 Message Date
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
aignatov-bio 01d6a17f2b
Fix permission check for inventory (#2039) 2019-09-09 15:11:18 +02:00
aignatov-bio bc86d5bc40
Fix import items to inventory (#2019) 2019-09-05 08:35:11 +02:00
Oleksii Kriuchykhin 267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio 5bf3a5d418
Fix sharing check in service [SCI-3798] (#2011) 
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder

* Fix sharing check in service

* Fix rebase conflicts
 2019-08-26 09:36:41 +02:00
Oleksii Kriuchykhin 2298ba4e4e Add path method to custom ActiveStorage S3 service [SCI-3765] 2019-08-21 14:33:28 +02:00
Urban Rotnik 89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
aignatov-bio 710af85743
Fix template generating (#1980) 2019-08-14 09:06:12 +02:00
Oleksii Kriuchykhin c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik 7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik 32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik 6cbece9f86 Add service for multiple share 2019-08-09 14:15:49 +02:00
Mojca Lorber 3c1f28ec06 fix smart annotation permission check 2019-08-09 14:13:03 +02:00
Mojca Lorber 71b881cbdf fix failing tests 2019-08-09 14:13:03 +02:00
Mojca Lorber 4c7c7ccdf1 Add ability to browse through shared inventories to smart annotations 2019-08-09 14:13:03 +02:00
Mojca Lorber cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Urban Rotnik 077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
aignatov-bio 6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin 973fc775c0 Enforce file size limits for direct uploads on S3 [SCI-3681] 2019-08-06 17:09:00 +02:00
Anton Ignatov e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Oleksii Kriuchykhin a2fe4bee94 Add text extraction from MarvinJS for search [SCI-3643] 2019-08-02 15:17:28 +02:00
Anton Ignatov f35f4886a3 Fix markup 2019-07-29 10:18:34 +02:00
Anton Ignatov 618f0cc334 Fix tests for services 2019-07-26 14:16:44 +02:00
Anton Ignatov 84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Anton Ignatov 0702dacc5b Security fixes 2019-07-19 14:10:38 +02:00
Anton Ignatov ad7130d3b2 Simplify TinyMCE assets for MarvinJS 2019-07-19 09:27:03 +02:00
Anton Ignatov bdc2dbbac1 Simplify image creation 2019-07-18 14:29:24 +02:00
Anton Ignatov 1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov 3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Miha Mencin 47d3315d82 SCI-3702 revert the fix and use local variables 2019-07-15 16:20:39 +02:00
Miha Mencin 1c84e46a21 Revert "SCI-3702 replace _to_text with _to_html" 
This reverts commit 93b7c472ac.
 2019-07-15 16:18:26 +02:00
Miha Mencin 93b7c472ac SCI-3702 replace _to_text with _to_html 2019-07-15 16:16:41 +02:00
Jure Grabnar a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Anton Ignatov ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov 7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
aignatov-bio 4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899) 
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
 2019-07-12 13:48:14 +02:00
aignatov-bio 5ca822a7d8
Add archive lables and fix bright colors in RTE fields (#1923) 2019-07-12 11:38:48 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin 64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
Urban Rotnik cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
aignatov-bio c8b0d87054
Fix global links in reports (#1894) 2019-07-09 09:35:43 +02:00
mlorb 7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618 
Remove unassign_user_from_project notification…[SCI-3618]
 2019-07-08 15:23:06 +02:00
Jure Grabnar ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio 0d1ec0d4ed
Fix I18n and constants in DOCX report (#1901) 2019-07-08 12:51:26 +02:00
Alex Kriuchykhin 82708f0124
Merge pull request #1891 from okriuchykhin/ok_SCI_3654 
Fix project page view saving [SCI-3654]
 2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Oleksii Kriuchykhin c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar 20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Oleksii Kriuchykhin e16cb513e1 Fix project page view saving [SCI-3654] 2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin 028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar 4715e8ec4b Fix building of zero steps protocls 
Close SCI-3648
 2019-07-03 09:34:15 +02:00
aignatov-bio b1a74a893c
Remove strange symbol (#1874) 2019-07-02 11:21:14 +02:00
Mojca Lorber 41935a9471 Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation 2019-07-01 13:44:27 +02:00
Anton Ignatov 1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
aignatov-bio 2793777463
Features/docx report (#1873) 
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
 2019-07-01 10:14:16 +02:00
Anton Ignatov 390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Oleksii Kriuchykhin 5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Jure Grabnar bc4b07cc0f Refactor hardcoded protocol_source in SearchService 2019-06-28 02:26:31 +02:00
Jure Grabnar 0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik 9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik 2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Jure Grabnar 06b8d1fda7 Update ApiClient tests 
Closes SCI-3434
 2019-06-27 14:54:19 +02:00
Jure Grabnar d31f978e55 DRY up protocols importer services errors 2019-06-27 10:11:36 +02:00
Mojca Lorber 9fd83d54a0 Put network error handeling into api and refactor errors 2019-06-26 14:04:03 +02:00
Mojca Lorber ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik c691ad80b5 Add fields to query params for ApiClient 2019-06-17 12:24:16 +02:00
Urban Rotnik 88d96c0938 Use service in controller 2019-06-17 12:24:15 +02:00
Urban Rotnik 7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar eb0d677a36 Refactor pio_protocol -> built_protocol 2019-06-17 12:24:13 +02:00
Urban Rotnik 0d43ecdfab Import protocol service after object is built 2019-06-17 12:24:11 +02:00
Jure Grabnar eb275c4d12 Add tests for BuildProtocolService and fix bugs 2019-06-17 12:24:11 +02:00
Jure Grabnar 362b0cd45d Hound fixes 2019-06-17 12:24:11 +02:00
Jure Grabnar 640f6c1211 Fix tests after BuildProtocolFromClientService refactor 
Closes SCI-3544
 2019-06-17 12:24:11 +02:00
Jure Grabnar 1e8627c450 Refactor ImportProtocol service to BuildProtocolService 
Closes SCI-3544
 2019-06-17 12:24:10 +02:00
Urban Rotnik a15596a126 Add ImportProtocolService 2019-06-17 12:24:10 +02:00
Oleksii Kriuchykhin 8920d38a02 Make repositories more extendable [SCI-3528] 2019-06-06 17:28:59 +02:00
Alex Kriuchykhin 36255f82ed
Merge pull request #1817 from okriuchykhin/ok_SCI_3522 
Add system notifications service to health check endpoint [SCI-3522]
 2019-06-04 14:41:43 +02:00
Oleksii Kriuchykhin 552f69b9b1 Add system notifications service to health check endpoint [SCI-3522] 2019-05-31 15:52:47 +02:00
Luka Murn b21bdddf15 Rename permision_eval - permission_eval 
Hopefully this will help with getting rid of all the errors
that we've been receiving for PermissionEval.

Closes SCI-2991.
 2019-05-31 09:56:54 +02:00
Oleksii Kriuchykhin 5a9640c5d1 Add aditional checks for inventory state objects [SCI-3412] 2019-05-27 17:32:21 +02:00
Mojca Lorber 5c847d5b5d Change author of copied inventory item 2019-05-13 15:37:36 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +02:00
Urban Rotnik 2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Anton Ignatov 7f296b35fa Update team exporter for new tinymce images 2019-05-07 13:22:55 +02:00
Oleksii Kriuchykhin 3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +02:00
aignatov-bio 6968060078
Fix user order bug (#1687) 2019-04-19 15:24:13 +02:00
Alex Kriuchykhin 8fa6bbc0ab
Merge pull request #1679 from okriuchykhin/ok_SCI_3177 
Improve experiment preview image generation [SCI-3177]
 2019-04-17 20:35:29 +02:00
Alex Kriuchykhin b4cf665c21
Merge pull request #1673 from okriuchykhin/ok_SCI_3294 
Fix team export/import for new activities [SCI-3294]
 2019-04-17 12:49:45 +02:00
Oleksii Kriuchykhin f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin 2320941b5d Fix team export/import for new activities [SCI-3294] 2019-04-15 15:13:10 +02:00
Alex Kriuchykhin 3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin 231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
aignatov-bio 8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +02:00
Oleksii Kriuchykhin d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
Oleksii Kriuchykhin 01ffb43c23 Include old activites assigned to the task [SCI-3285] 2019-04-02 18:37:55 +02:00
Urban Rotnik 86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Urban Rotnik 8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
Urban Rotnik 6ec22c0b3b
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory 
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
 2019-04-02 11:02:57 +02:00
aignatov-bio daaa6a367b
Adding custom scrollbar to global activities [SCI-3206] (#1623) 
* Adding custom scrollbar to global activities
 2019-04-02 09:56:50 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Alex Kriuchykhin b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255 
Add global activities to reports [SCI-3255]
 2019-04-01 15:07:06 +02:00
Jure Grabnar e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Jure Grabnar 83130426e2
Merge pull request #1617 from jbargu/jg_3244 
Duplicated activity, report activity ... [SCI-3244]
 2019-04-01 14:31:53 +02:00