Commit graph

246 commits

Author SHA1 Message Date
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
Urban Rotnik
462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik
777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
aignatov-bio
008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio
7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
aignatov-bio
f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio
21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Oleksii Kriuchykhin
60017661c1 Fix import of the old format TinyMCE images [SCI-4767] 2020-07-27 16:39:39 +02:00
Oleksii Kriuchykhin
dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik
83bd8c3ad4 Add default scope for non archived repositories 2020-06-16 09:18:22 +02:00
Urban Rotnik
446a2db186 Export and import checklist items with delimiter 2020-06-01 17:19:33 +02:00
Urban Rotnik
32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
Urban Rotnik
2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Urban Rotnik
a96d19d5ea Add table name attribute to export schema 2020-05-11 11:25:41 +02:00
Oleksii Kriuchykhin
837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Mojca Lorber
8dac5effbe Another fix 2020-03-13 14:57:26 +01:00
Mojca Lorber
c716a52aae Fix bug with date format when importing to inventory 2020-03-12 12:19:25 +01:00
aignatov-bio
4af992ef35 Fix date import for repository 2020-03-05 14:34:31 +01:00
Oleksii Kriuchykhin
63e557ea9e Add global repositories limit [SCI-4383] 2020-02-21 14:40:17 +01:00
Oleksii Kriuchykhin
3310d79c4c Fix failing tests [SCI-4336] 2020-02-11 16:12:53 +01:00
Oleksii Kriuchykhin
0fec8f4d95 Improve speed of inventory import [SCI-4336] 2020-02-11 13:51:34 +01:00
Oleksii Kriuchykhin
b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
aignatov-bio
f9497e2e3e Fix TinyMCE import from ELN 2019-10-07 16:21:11 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin
6f7ef25514 Add local sorting for ProtocolsIO [SCI-3827] 2019-09-05 14:49:16 +02:00
aignatov-bio
6fda5401f5
Fix protocol import (#1981) 2019-08-14 09:06:25 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +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
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Luka Murn
12dd9c9b5c Update the first time data generator to ignore sample names. 2019-07-26 10:13:14 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Anton Ignatov
3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
Urban Rotnik
795c355f01
Merge pull request #1915 from urbanrotnik/ur-sci-3531-tests-for-step-components
Add tests for StepComponents [SCI-3531]
2019-07-15 13:25:36 +02:00
Jure Grabnar
015dae1a05 Fix old tests 2019-07-15 08:27:34 +02:00
Jure Grabnar
a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Urban Rotnik
5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00