Commit graph

378 commits

Author SHA1 Message Date
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
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