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

201 commits

Author SHA1 Message Date
artoscinote 7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
 2023-09-01 11:40:34 +02:00
Giga Chubinidze b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote 51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081 
Placeholder text (titles, description field) [SCI-9081]
 2023-09-01 11:02:06 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Giga Chubinidze 6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
G-Chubinidze 7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104) 
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
 2023-08-30 15:42:55 +02:00
aignatov-bio e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal 
Revamp filters flyouts [SCI-8977]
 2023-08-29 10:18:54 +02:00
Anton 171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
G-Chubinidze bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087) 
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
 2023-08-28 10:36:40 +02:00
Giga Chubinidze 0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
Giga Chubinidze 6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
Anton 6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
Anton e66968357a Fix hound 2023-08-25 09:46:53 +02:00
Anton f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
artoscinote e1416e3efd
Merge branch 'features/september-release' into ma_SCI_9013 2023-08-23 12:01:14 +02:00
Martin Artnik b3965e5aca Implement result filters [SCI-9013] 2023-08-23 11:59:21 +02:00
aignatov-bio c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements 
Add element movements between step and results [SCI-9024]
 2023-08-22 12:26:57 +02:00
Anton e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Giga Chubinidze c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
Anton 16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Anton 6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Anton f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik 16dbd48ad3 Merge branch 'develop' into features/september-release 2023-08-10 13:21:27 +02:00
Martin Artnik 4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +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
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 fcd76661c7 Fix inline edit 2023-08-08 11:09:26 +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
wandji 31f8bc19d5
Add unique database index to checklist items position (#5886) 
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
 2023-08-02 15:37:01 +02:00
Martin Artnik 76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
artoscinote f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu 
Refactor insert menu [SCI-8905]
 2023-08-01 10:13:23 +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
Anton f4d8983040 Update attachments section [SCI-8879] 2023-07-25 15:10:09 +02:00
Anton aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Martin Artnik 30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +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 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
wandji20 a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20 973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01:00
Anton 4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Martin Artnik ed4af7ae26 Properly unload scroll listener when unloading a select [SCI-8802] 2023-07-06 10:31:26 +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 272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
Anton b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
sboursen-scinote 43bf1cf0eb Add loading state to select_search [SCI-8545] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-12 10:49:31 +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
artoscinote 164829fd7c
Fix issue where blur prevention is not turned off in assignment modal dropdown [SCI-8588] (#5570) 2023-06-07 09:52:57 +02:00
artoscinote 98cb0df46b
Fix issues with assign to task dropdowns [SCI-8588] (#5568) 2023-06-06 15:31:40 +02:00
Soufiane e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:47:35 +02:00
Soufiane cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486) 
* Fix Select bounding box calculations [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Abbreviate very long select text [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove gap when dropdown is open [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Add small refactor [SCI-8513]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-26 11:41:47 +02:00
Soufiane f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441) 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
 2023-05-24 10:47:27 +02:00
Anton 043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
sboursen-scinote 9662eb7264 Improve the logic of the select and select_search components 
> There is no need for the two components to hold their `value` state.
It can be propagated from the component that uses them.
This will help 'clear' the search when modification is finished.
 2023-05-17 19:01:16 +02:00
artoscinote a52ee99781
Add debounce file [SCI-8300] (#5419) 2023-05-17 12:00:37 +02:00
Soufiane dda3d1bc6b
Fix typo [SCI-8250] (#5393) 2023-05-16 11:19:19 +02:00
sboursen-scinote 852e0eba42 Remove unused code [SCI-8250] 2023-05-08 12:52:57 +02:00
sboursen-scinote 32297c3312 Use fixed position for select option and add a fix for modals [SCI-8250] 2023-05-08 11:05:22 +02:00
sboursen-scinote d6a3da2c6f Fix hound [SCI-8250] 2023-05-08 09:57:31 +02:00
sboursen-scinote 5f8eafedf9 Create a modal for item assignment from inventory page [SCI-8250] 
- Fix the behavior of the search_select.
- Fix select options positioning.
- Get the items to assign from selected rows.
- Style the modal.

Style the modal [SCI-8250]

Fix select options positioning [SCI-8250]
 2023-05-08 09:43:18 +02:00
sboursen-scinote 443cd21090 WIP: Create a modal for inventory item assignment from inventory page [SCI-8250] 2023-05-05 08:44:40 +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
Martin Artnik 863054b044 Implement basic select/search-select components in vue [SCI-8249] 2023-05-03 12:37:14 +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
artoscinote dd97a83de1
Merge pull request #5303 from G-Chubinidze/gc_SCI_7459 
Not saved checklist item at pasting text [SCI-7459]
 2023-04-14 10:28:38 +02:00
Giga Chubinidze 5fa59ec2a0 Not saved checklist item at pasting text [SCI-7459] 2023-04-13 21:58:49 +04: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
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 47b7d1a1ca
Merge pull request #4999 from G-Chubinidze/gc_SCI_7935 
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
 2023-04-05 15:23:03 +02:00
Anton 0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Anton ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Alex Kriuchykhin 87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
Giga Chubinidze 34cfb14869 Rearrange of checklist items does not work after pasting several items at once [SCI-7935] 2023-02-21 10:44:28 +04:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik 14c6c67a1a Fix merging tables in TinyMCE [SCI-7697] 2023-01-13 15:29:16 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
Martin Artnik 3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik 13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
aignatov-bio aba760f1a4
Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component 
Fix duplicate labels in dropdown components [SCI-7285]
 2022-09-30 19:51:34 +02:00
Anton 0107368b67 Fix duplicate labels in dropdown components [SCI-7285] 2022-09-29 21:11:00 +02:00
ajugo 103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] (#4475) 2022-09-29 14:47:59 +02:00
aignatov-bio d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template 
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
 2022-09-29 13:56:39 +02:00
Anton 7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +02:00