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
14846 commits 31 branches 181 tags 166 MiB
Commit graph

236 commits

Author SHA1 Message Date
Anton
6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +02:00
Soufiane
0191b9e9ab
Fix wellplates reversed columns and rows headers [SCI-9071] (#6196) 
- Fix well plates reversed columns and rows headers.
- Fix jumping when in edit mode.
- Fix disappearing columns after edit.
 2023-09-15 14:52:36 +02:00
Anton
b0dc63ebb5 Replace flyouts menu in protocol in results [SCI-9265] 2023-09-15 12:39:56 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Martin Artnik
fd6ae82874
Merge pull request #6218 from artoscinote/ma_SCI_9295 
Fix handson table rendering [SCI-9295]
 2023-09-14 12:26:05 +02:00
Anton
4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Martin Artnik
c3aab9c3a9 Fix handson table rendering [SCI-9295] 2023-09-14 10:52:08 +02:00
aignatov-bio
f5b08ffb33
Merge pull request #6212 from aignatov-bio/ai-sci-9260-fix-new-office-in-results 
Fix office creation on results [SCI-9260]
 2023-09-13 14:36:23 +02:00
aignatov-bio
0e290fa2dc
Merge pull request #6211 from aignatov-bio/ai-sci-9271-fix-checklist-rearange 
Fix checklist rearrange [SCI-9271]
 2023-09-13 14:35:54 +02:00
Anton
d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Anton
718013439d Fix checklist rearrange [SCI-9271] 2023-09-13 14:13:34 +02:00
Anton
3268a95ecf Fix text field width and table header [SCI-9149] 2023-09-13 14:03:49 +02:00
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Anton
982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
Anton
67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
Martin Artnik
8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267 
Fix attachment sorting in results [SCI-9267]
 2023-09-11 10:01:26 +02:00
Martin Artnik
266c78deb1
Merge pull request #6179 from artoscinote/ma_SCI_9278 
Disable move button in move content modal if there's no target selected [SCI-9278]
 2023-09-11 09:59:47 +02:00
Martin Artnik
f0c77b4e7d Disable move button in move content modal if there's no target selected [SCI-9278] 2023-09-08 16:26:29 +02:00
Martin Artnik
ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
aignatov-bio
92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
Anton
53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
Martin Artnik
70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209 
Fix attachment deletion and image errors [SCI-9209]
 2023-09-07 10:37:41 +02:00
Anton
7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Martin Artnik
1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187 
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
 2023-09-06 14:31:05 +02:00
Giga Chubinidze
76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
aignatov-bio
b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework 
Rework inline edit vue component UI [SCI-9016]
 2023-09-06 10:49:18 +02:00
Anton
48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Martin Artnik
94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
Ivan Kljun
a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Ivan Kljun
86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Ivan Kljun
40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
artoscinote
dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186 
Button translation in the "Move to different result" Modal [sci-9186]
 2023-09-01 11:40:57 +02:00
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