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

287 commits

Author SHA1 Message Date
Anton 0ec734b467 Merge branch 'develop' into features/notification-revamp 2023-11-23 10:05:42 +01:00
wandji 7a916b7d11
Add activities to inventories [SCI-5578] (#6588) 
* Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578]

* Improve check for creating inventory item asset activity [5578]

* Improve query for inventory items in consumption export [SCI-5578]
 2023-11-20 13:37:57 +01:00
ajugo 5878ed0c7c
Fix unit test [SCI-9570] (#6552) 2023-11-13 09:34:38 +01:00
wandji20 8408b65818 Fix issue with text name when importting protocol eln file [SCI-9490] 2023-10-06 14:19:42 +01:00
wandji20 6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Alex Kriuchykhin 40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration 
Features/ove integration
 2023-09-13 17:05:48 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
Alex Kriuchykhin df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
Alex Kriuchykhin 8b47982ccc
Fix fetching of WOPI discovery document [SCI-8889] (#5803) 2023-07-18 15:25:04 +02:00
ajugo 2b848733b4
Fix assigning repository items through smart annotation pop-up to task [SCI-8417] (#5401) 2023-05-16 11:08:13 +02:00
ajugo 38ae8ff743
Fix opening of the smart annotation pop-up window [SCI-8048] (#5362) 2023-05-05 16:09:14 +02:00
Andrej 29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
Soufiane 94465ffb93
Unicode issue in Protocol and destroy user modal [SCI-7512] (#5328) 
* Fix unicode issue in destroy team member modal [SCI-7512]
 2023-05-03 16:08:46 +02:00
Soufiane 314c7cbfd9
Add object IDs to smart annotation search and global search [SCI-8085] (#5151) 
Add object codes to global search [SCI-8085]
 2023-05-03 11:07:18 +02:00
Soufiane 32c483316f
Enable searching by ID when smart annotating [SCI-7944] (#5055) 
Add objects search by ID in smart annotations [SCI-7944]
 2023-05-03 11:05:29 +02:00
ajugo d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
sboursen-scinote b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
Soufiane 5e321b761d
Enable support of files larger than 4GB in zip [SCI-8267] (#5278) 
Update rubyzip gem to the latest version and enable support for large files [SCI-8267]
 2023-04-11 11:36:27 +02:00
sboursen-scinote 6d984d8dfc Fix protocol.io search [SCI-8286] 
- Reduce the number of displayed publications to 20 for speed
- Clear the search result each time a new key (search sentence) is used
 2023-04-11 10:30:58 +02:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
ajugo 9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
ajugo 0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
Alex Kriuchykhin 5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] (#5017) 2023-02-27 10:37:51 +01:00
ajugo c1f55e99a7
Fix protocol import for empty metadata [SCI-7915] (#4996) 2023-02-20 13:21:01 +01:00
Anton df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
ajugo 5dd9a7adaf
Fixed protocols.io import for multiple-step cases. [SCI-7843] (#4946) 
* Fix attachments for protocols.io importer [SCI-7843]

* Fix protocols io import for multiple step cases [SCI-7843]
 2023-02-07 15:34:04 +01:00
ajugo 6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911) 
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
 2023-02-01 12:01:18 +01:00
ajugo 35b5041846
Add wopi net zone environment variable [SCI-7753] (#4815) 2023-01-13 10:19:14 +01:00
ajugo 369fffc467
Fix building of circular protocols for protocols.io [SCI-7388] (#4665) 2022-12-05 10:21:12 +01:00
Anton 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Martin Artnik 6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
Oleksii Kriuchykhin 3d00249644 Fix export of protocols with empty step text fields [SCI-7126] 2022-08-23 14:30:30 +02:00
artoscinote 187197488b
Pdf viewer and protocol fixes [SCI-7074] (#4327) 2022-08-09 10:13:43 +02:00
artoscinote 6b79f32e52
Fix asset V2 export/import [SCI-6936] (#4185) 
* Fix asset V2 export/import [SCI-6936]

* Fix import of legacy eln step description images [SCI-6937]
 2022-07-01 11:35:04 +02:00
artoscinote 5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142) 
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
 2022-06-10 10:18:55 +02:00
Oleksii Kriuchykhin 03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
Alex Kriuchykhin 1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Martin Artnik 1b26a4f65a Added access token to protocols.io requests [SCI-5968] 2021-08-26 15:26:35 +02:00
Oleksii Kriuchykhin c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Oleksii Kriuchykhin 324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
Oleksii Kriuchykhin 1ba13c8c5e Clean up and fix mistakes in demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Mojca Lorber 8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio 016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio 0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio 9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +02:00