Martin Artnik
0489b853d3
Merge pull request #6673 from aignatov-bio/ai-sci-9697-improve-filters-layout
...
Fix filters layout [SCI-9697]
2023-11-21 10:09:24 +01:00
Martin Artnik
1bfdb722e8
Merge pull request #6672 from aignatov-bio/ai-sci-fix-resizeable-navigator
...
Fix resizeable navigator [SCI-9666]
2023-11-21 09:37:38 +01:00
Anton
d68367eb37
Fix filters layout [SCI-9697]
2023-11-20 16:38:45 +01:00
Anton
6b82e12165
Fix resizeble navigator
2023-11-20 16:28:43 +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
Oleksii Kriuchykhin
b475203b50
Bump version to 1.28.0.6
2023-11-20 13:50:28 +01:00
Oleksii Kriuchykhin
d507ae0b93
Merge branch 'release/1.28.0.5' into release/1.28.0
2023-11-20 13:49:37 +01:00
Oleksii Kriuchykhin
84ed80ef23
Bump version to 1.28.0.5
2023-11-20 13:44:14 +01:00
wandji
0fc485705c
Fix issue with decimal precision on the manage stock modal and ledger exports [SCI-9646] ( #6641 )
2023-11-20 13:25:20 +01:00
Alex Kriuchykhin
43b8f97126
Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] ( #6565 )
2023-11-20 13:24:31 +01:00
aignatov-bio
26c726789c
Merge pull request #6670 from aignatov-bio/ai-sci-9733-fix-vue3-upgrade-issues
...
Vue3 migration fixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738]
2023-11-20 11:55:30 +01:00
ajugo
790038fdc5
Fix test for due_date [SCI-9570] ( #6669 )
2023-11-20 11:46:00 +01:00
Anton
2b51a4f4bd
Vue3 migration mfixes [SCI-9733][SCI-9735][SCI-9736][SCI-9738]
2023-11-20 11:41:30 +01:00
Gregor Lasnibat
e3cd70ea0d
(fix) Item card changes are not visible at click away [SCI-9681]
2023-11-20 09:36:47 +01:00
Gregor Lasnibat
bbe71c4a26
(Fix) Only one item can be opened on item card [SCI-9686]
2023-11-19 18:10:19 +01:00
aignatov-bio
143a326885
Merge pull request #6665 from aignatov-bio/ai-sci-9731-fix-result-page
...
Result page fixes [SCI-9731]
2023-11-17 15:53:12 +01:00
Anton
9be17cfaf3
Result page fixes [SCI-9731]
2023-11-17 15:01:28 +01:00
aignatov-bio
76e4dfc49d
Merge pull request #6664 from aignatov-bio/ai-sci-9726-fix-task-result-dropdown
...
Fixes vue3 migration [SCI-9726][SCI-9728][SCI-9729]
2023-11-17 14:21:23 +01:00
Anton
6cff10ec7c
Fixes vue3 migration [SCI-9726][SCI-9728][SCI-9729]
2023-11-17 14:19:26 +01:00
ajugo
91f5f2b587
Add missing collapse all icon [SCI-9717] ( #6663 )
2023-11-17 14:19:04 +01:00
Giga Chubinidze
7479ee7b12
Modify 3 colors for tags [SCI-9664]
2023-11-17 13:43:01 +01:00
Giga Chubinidze
72e9fda749
Add colors for tags [SCI-9664]
2023-11-17 13:42:55 +01:00
Martin Artnik
8d886951d1
Merge pull request #6662 from G-Chubinidze/gc_SCI_9664_pt2
...
Modify 3 colors for tags [SCI-c]
2023-11-17 13:19:14 +01:00
Giga Chubinidze
8bd87a5dd4
Modify 3 colors for tags [SCI-9664]
2023-11-17 16:17:51 +04:00
ajugo
1a82ff8d94
Fix report controller tests [SCI-9570] ( #6652 )
2023-11-17 11:39:13 +01:00
dependabot[bot]
cf5247183e
Bump tinymce from 6.7.1 to 6.7.3 ( #6650 )
...
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 6.7.1 to 6.7.3.
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce/commits/6.7.3/modules/tinymce )
---
updated-dependencies:
- dependency-name: tinymce
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-17 11:18:25 +01:00
ajugo
8853f54ad3
Fix rendering template for additional data for reports [SCI-9717] ( #6660 )
2023-11-17 11:11:07 +01:00
aignatov-bio
5dbfed20c8
Merge pull request #6647 from aignatov-bio/ai-sci-9706-fix-time-inconsistent
...
Fix time format and picker position [SCI-9706]
2023-11-17 10:04:32 +01:00
Ivan Kljun
dd2611bb82
Making asset sync feature switchable [SCI-9709]
2023-11-17 07:41:12 +01:00
Martin Artnik
4082ecc326
Merge pull request #6657 from lasniscinote/gl_SCI_9708
...
Apply vue3 upgrade to Item Card [SCI-9708]
2023-11-16 16:29:58 +01:00
Gregor Lasnibat
4ad01a4086
Apply vue3 upgrade to Item Card [SCI-9708]
2023-11-16 16:25:34 +01:00
Martin Artnik
3547b7c2d1
Merge pull request #6655 from scinote-eln/e2e
...
Merge e2e
2023-11-16 13:23:13 +01:00
Martin Artnik
6feb61d45c
Merge pull request #6653 from G-Chubinidze/gc_SCI_9665
...
Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665]
2023-11-16 13:04:29 +01:00
Oleksii Kriuchykhin
cc8b993430
Merge branch 'develop' into features/inventory-item-card-edit
2023-11-16 11:12:50 +01:00
Giga Chubinidze
85709d7b43
Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665]
2023-11-16 12:28:31 +04:00
ajugo
a765ab009d
Fix report template loading [SCI-9663] ( #6651 )
2023-11-16 09:05:21 +01:00
Anton
13eca7e035
Fix time format and picker position [SCI-9706]
2023-11-15 16:18:00 +01:00
dependabot[bot]
89ac9a029a
Bump axios from 1.4.0 to 1.6.0 ( #6625 )
...
Bumps [axios](https://github.com/axios/axios ) from 1.4.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v1.4.0...v1.6.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-15 15:48:36 +01:00
aignatov-bio
8d5a666b57
Merge pull request #6646 from scinote-eln/features/datetime-picker
...
Features/datetime picker
2023-11-15 14:50:55 +01:00
aignatov-bio
33d9d768e2
Merge pull request #6644 from aignatov-bio/ai-sci-9700-fix-turbolinks
...
Fix turbolinks cache settings [SCI-9700][SCI-9701]
2023-11-15 13:42:35 +01:00
Anton
8d2187815b
Fix turbolinks cache settings [SCI-9700][SCI-9701]
2023-11-15 11:02:50 +01:00
ajugo
b916ad0bfe
Fix makefile for test [SCI-9570] ( #6631 )
2023-11-15 10:59:54 +01:00
Oleksii Kriuchykhin
3bc7edc7f7
Merge branch 'develop' into features/inventory-item-card-edit
2023-11-15 10:58:42 +01:00
Martin Artnik
d16b48b1cf
Bump version to 1.29.2
2023-11-15 10:27:56 +01:00
Martin Artnik
51899121ef
Merge pull request #6642 from scinote-eln/revert-6640-ma_SCI_9693
...
Revert "Fix result settings for reports [SCI-9693]"
2023-11-15 09:23:49 +01:00
Martin Artnik
9db6fb2ef5
Revert "Fix result settings for reports [SCI-9693]"
2023-11-15 09:23:38 +01:00
Anton
7fe2922f2d
Merge branch 'features/datetime-picker' of github.com:scinote-eln/scinote-web into features/datetime-picker
2023-11-14 18:08:48 +01:00
Anton
6abc643aec
Merge branch 'develop' into features/datetime-picker
2023-11-14 18:08:03 +01:00
aignatov-bio
65898ddd70
Merge pull request #6638 from aignatov-bio/ai-sci-fix-repository-update
...
Fix repository range validation [SCI-9691]
2023-11-14 17:50:31 +01:00
Martin Artnik
7b6d60fed5
Merge pull request #6640 from artoscinote/ma_SCI_9693
...
Fix result settings for reports [SCI-9693]
2023-11-14 17:00:58 +01:00
