scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
14973 commits 31 branches 181 tags 166 MiB
Commit graph

363 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Anton
6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
Anton
eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
sboursen-scinote
195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
Anton
f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
wandji20
b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
wandji20
5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20
7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Andrej
6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
sboursen-scinote
d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966] 
- Fix edit button label and icon
- Fix preview modal for gene-sequence
 2023-08-16 17:01:43 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
artoscinote
c42a10e131
Merge pull request #5945 from ivanscinote/SCI-8955-result-content-rearange 
Make result content rearrangable [SCI-8955]
 2023-08-09 15:58:17 +02:00
Ivan Kljun
669bb3dd48 Make result content rearrangable (UI needs to be finalised and tested with actual data) [SCI-8955] 2023-08-09 13:58:25 +02:00
Anton
f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933) 
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
 2023-08-09 10:33:58 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
Anton
2b83243aa8 Refactor insert menu [SCI-8905] 2023-07-26 16:28:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Giga Chubinidze
ab41b5e219 Some icons have the checkboard pattern applied to the background [SCI-5605] 2023-07-25 11:52:31 +04:00
sboursen-scinote
634d4b6066 Prefill the protocol name in modal when saving from template [SCI-8239] 2023-07-25 09:23:32 +02:00
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Martin Artnik
ebfaca6966 Clear wopi file length error on input, css fix [SCI-8877] 2023-07-24 12:46:45 +02:00
Anton
2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736) 
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
 2023-07-14 12:31:54 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766) 
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
 2023-07-14 12:31:15 +02:00
Anton
4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes 
Multiple CSS fixes [SCI-8762]
 2023-07-12 14:34:59 +02:00
Anton
24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions 
Fix checklists drag/drop interactions in Safari [SCI-8716]
 2023-07-12 09:48:27 +02:00
Anton
71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316 
Add office file to task step - reload file does not work for empty file [SCI-8316]
 2023-06-20 11:12:28 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
G-Chubinidze
3a2ad1eda6
Well template table arrow & math calculation disabled [SCI-8596] (#5549) 2023-06-02 16:08:42 +02:00
sboursen-scinote
a58803a2cd Fix Reload button for new attachement (Wopi) when content changes [SCI-8316] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 15:49:38 +02:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
Andrej
6ed55be62c Fix merge conflicts 2023-05-17 11:40:14 +02:00
Andrej
32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
Soufiane
19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] (#5406) 2023-05-16 11:19:56 +02:00
ajugo
d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +02:00
Andrej
97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +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
ajugo
d92a9d62b3
Fix opening of the step reorderable modal [SCI-8364] (#5358) 2023-05-04 09:48:59 +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
G-Chubinidze
413a65972b
At click away to another page save input to step table [SCI-8096] (#5257) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-25 14:33:32 +02:00
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302) 
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
 2023-04-18 15:42:53 +02:00
Anton
265272f212 Fix marvin js icon 2023-04-18 14:09:41 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
aignatov-bio
134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution 
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
 2023-04-14 10:37:51 +02:00
sboursen-scinote
4783ffcc4f Fix the issue with the published version number and refactor the code [SCI-8237] 2023-04-14 09:56:35 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor 
Features/navigation refactor
 2023-04-13 13:59:25 +02:00
sboursen-scinote
0b76acbede Change the draft version to be the next one after the latest published [SCI-8237] 2023-04-11 16:29:12 +02:00
sboursen-scinote
0efeb1d4cb Add version number to publish modal [SCI-8237] 2023-04-11 15:04:14 +02:00
sboursen-scinote
b1914468c9 Add version number to protocol details [SCI-8237] 2023-04-11 15:00:21 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272) 
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
 2023-04-11 12:50:14 +02:00
sboursen-scinote
910b67f881 Save protocol steps order when modal is hidden [SCI-8276] 2023-04-10 09:27:44 +02:00
ajugo
4961243731
Fix protocol dropdown options for the locked tasks and archived protocol template [SCI-8277] (#5264) 2023-04-06 16:29:19 +02:00
ajugo
3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +02:00
artoscinote
a1cebecdcd
Merge pull request #5037 from G-Chubinidze/gc_SCI_7673 
Add office file to task step - reload file option shows plain html page [SCI-7673]
 2023-04-05 15:26:18 +02:00
Soufiane
4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239) 
Added Published on & Published by to Protocol details screen [SCI-8193]
 2023-04-05 15:08:31 +02:00
G-Chubinidze
045220c657
Wrong error message for too long office file name [SCI-7949] (#5155) 
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2023-04-05 13:56:25 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze
57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin
ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
Oleksii Kriuchykhin
0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Oleksii Kriuchykhin
cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Anton
5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane
bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote
d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
ajugo
917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
G-Chubinidze
7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane
7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131) 
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
 2023-03-14 12:54:13 +01:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00