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

416 commits

Author SHA1 Message Date
Martin Artnik
19297c8f69 Fix label printing modal [SCI-9749] 2023-11-21 13:39:21 +01:00
wandji
91f650e227
Reload inventory table after changes to item card [SCI-9617] (#6626) 
* Reload inventory table row after changes to item card [SCI-9617]

* Reload full table after updating item card column [SCI-9617]

* Update 2 line if condition formatting style [SCI-9617]
 2023-11-20 15:26:01 +01:00
Anton
2b51a4f4bd Vue3 migration mfixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738] 2023-11-20 11:41:30 +01:00
Anton
6cff10ec7c Fixes vue3 migration [SCI-9726][SCI-9728][SCI-9729] 2023-11-17 14:19:26 +01:00
Gregor Lasnibat
4ad01a4086 Apply vue3 upgrade to Item Card [SCI-9708] 2023-11-16 16:25:34 +01:00
Oleksii Kriuchykhin
cc8b993430 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-16 11:12:50 +01:00
Oleksii Kriuchykhin
e8abbbbcdf Merge branch 'develop' into features/inventory-items-relationships 2023-11-16 11:04:27 +01:00
Oleksii Kriuchykhin
3bc7edc7f7 Merge branch 'develop' into features/inventory-item-card-edit 2023-11-15 10:58:42 +01:00
Anton
b7f876aa37 Date time picker improvments [SCI-9678][SCI-9688] 2023-11-14 11:26:27 +01:00
Anton
7048729415 Merge branch 'features/datetime-picker' into features/new-datatable 2023-11-10 13:35:46 +01:00
Oleksii Kriuchykhin
29f43d42af Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships 2023-11-10 09:26:05 +01:00
Oleksii Kriuchykhin
0b72740062 Merge branch 'develop' into features/inventory-items-relationships 2023-11-10 09:19:45 +01:00
Anton
bb0fdad3dc Improve turbolinks 2023-11-09 19:22:50 +01:00
Anton
e4deaf41a1 Update outside click 2023-11-09 12:40:06 +01:00
Anton
96fec890be Merge branch 'develop' into features/datetime-picker 2023-11-09 12:21:02 +01:00
Anton
3211fa7cce Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2023-11-09 11:36:44 +01:00
Martin Artnik
4c27ea32d2 Fix outside-click directive to not kill Turbolinks [SCI-9675] 2023-11-09 11:29:17 +01:00
Anton
f92f0790ed Fix resizeable navigator 2023-11-08 19:32:43 +01:00
Anton
dcf206368e Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker 2023-11-08 14:57:29 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Anton
b09bd8a3c5 Add style styling to datetime pixker [SCI-9627] 2023-11-08 13:55:08 +01:00
Anton
a6b22b958c Fix datetime picker css 2023-11-07 16:10:17 +01:00
Anton
688538aa39 Replace datetime pickers in repositories [SCI-9629] 2023-11-07 11:46:25 +01:00
Anton
d4f555da40 Replace datepicker in filters [SCI-9626] 2023-11-06 10:12:06 +01:00
Martin Artnik
a03a678931
Merge pull request #6473 from ivanscinote/SCI-9449-tiny-mce-sticky-header-images-toolbar-issues 
Add a listener for when TinyMCE is opened and adjust headers [SCI-9449]
 2023-11-03 11:08:35 +01:00
Anton
70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
Ivan Kljun
6dd917552e Add timestap to bypass Chrome cache for TinyMCE images [SCI-9597] 2023-10-30 15:01:14 +01:00
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
wandji
c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474) 
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
 2023-10-27 10:31:38 +02:00
Anton
226d189789 Add new datetime pciker [SCI-9127] 2023-10-26 15:01:26 +02:00
Soufiane
9809f696a2
FIX: Clearing inventory item filter fails with 500 or breaks UI [SCI-9345] (#6358) 2023-10-24 16:05:35 +02:00
Soufiane
809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421) 
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
 2023-10-24 15:49:37 +02:00
Anton
1dd178fb4d Update vue packs to vue3 [SCI-8847] 2023-10-24 13:16:22 +02:00
wandji
cedb0cc023
Add edit feature for item card date fields [SCI-9416] (#6431) 2023-10-23 20:57:12 +02:00
Gregor Lasnibat
6e6afaf223
Implemented custom scrollspy logic [SCI-9528] (#6495) 2023-10-19 11:36:12 +02:00
Ivan Kljun
a93c35a3be Add a listener for when TinyMCE is opened and adjust headers [SCI-9449] 2023-10-18 10:53:58 +02:00
Martin Artnik
88bdd36dd9
Merge pull request #6443 from artoscinote/ma_SCI_9496 
Refactor select.vue to use the outside click directive [SCI-9496]
 2023-10-16 10:24:25 +02:00
Anton
225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Martin Artnik
45e45d1543 Refactor select.vue to use the outside click directive [SCI-9496] 2023-10-13 16:12:01 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
Gregor Lasnibat
27652fd1a0
Working on sticky header + navigation behaviour [SCI-9472] (#6428) 
Working on highlighting ScrollSpy when scrolling. Decided on external library [SCI-9472]

Finished not sticky item header v.01 [SCI-9472]

PR fix01 [SCI-9472]
 2023-10-12 15:35:30 +02:00
ivanscinote
a5ec4a6c95
Fix outside_click.js [SCI-9404] (#6398) 2023-10-12 15:27:36 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Anton
4db213b331 Fix tinymce header bug [SCI-9448] 2023-10-09 09:15:43 +02:00
Martin Artnik
29147e8bc4 Fix TinyMCE sticky header in protocol templates [SCI-9467] 2023-10-06 13:41:04 +02:00
Gregor Lasnibat
80de7483eb Prepare a modal displaying relationships for a specific item [SCI-9357] 2023-10-03 09:33:39 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Anton
bb4349f346 Initial label templates refactor [SCI-9303] 2023-09-25 14:24:22 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153] 
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
 2023-09-21 20:18:20 +02:00
Oleksii Kriuchykhin
36f4e22fa3 Merge branch 'develop' into features/october-release 2023-09-15 14:08:45 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Gregor Lasnibat
6709d5ee73 Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] 2023-09-13 08:34:07 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176) 
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
 2023-09-11 09:50:05 +02:00
Anton
b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik
c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +02:00
artoscinote
ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 
Hotfix/1.28.0.2
 2023-08-29 16:31:04 +02:00
Soufiane
a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081) 
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
 2023-08-25 14:22:37 +02:00
Martin Artnik
dfa2afa480 Fix sticky tinyMCE menu offset [SCI-9131] 2023-08-24 14:21:30 +02:00
ivanscinote
059530620b
Implement delegated event handling for rel='external' [SCI-8737] (#6050) 
* Replace tinymce target='_blank' with rel='external' [SCI-8737]

* Add noopener to rel='external' links
 2023-08-24 11:12:11 +02:00
ajugo
253be93368
Fix loading of navigators [SCI-8797] (#5868) 2023-08-23 15:49:00 +02:00
artoscinote
e03920affd
Merge branch 'develop' into ma_SCI_8462 2023-08-23 11:21:32 +02:00
Anton
beed1cdb9d Make top navigation and breadcrumbs collapsable [SCI-9090] 2023-08-22 16:24:34 +02:00
ivanscinote
c8bc4bef01
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737] (#5866) 
Refactor new tab opening mechanism and update link options in TinyMCE v6 [SCI-8737]
 2023-08-22 14:59:34 +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
Andrej
35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
Anton
0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
Ivan Kljun
b357e3117c Merge remote-tracking branch 'upstream/features/september-release' into SCI-8893-navigator-freezes 2023-08-21 09:16:32 +02:00
Ivan Kljun
0c1f47eada Add hound linter suggestion 2023-08-21 09:09:40 +02:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Alex Kriuchykhin
975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues 
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
 2023-08-16 15:34:57 +02:00
Ivan Kljun
1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Anton
a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Alex Kriuchykhin
c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
Anton
ac37885885 Merge branch 'develop' into features/september-release 2023-08-10 15:01:58 +02:00
Anton
3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Anton
2da83f460f Test moving jquery 2023-08-09 14:43:17 +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
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing 
Merge features/protocol-parsing to develop
 2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release 
Merge features/august release to develop
 2023-08-04 14:01:44 +02:00
Ivan Kljun
0bdbe84d4d Add hound linter suggestions 2023-08-02 17:02:11 +02:00
Ivan Kljun
2d26c70d40 Create vue method for toggling navigator state 2023-08-02 16:45:06 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ajugo
fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878) 
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
 2023-08-01 16:46:41 +02:00
wandji
2680b317e5
Fix issue when toggling repository items search fields [SCI-8874] (#5855) 
* Fix issue when toggling repository items search fields [SCI-8874]

* Refactor outside click directive and make it available for all components [SCI-8874]
 2023-08-01 10:41:58 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895) 
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
 2023-08-01 10:30:57 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00