Commit graph

317 commits

Author SHA1 Message Date
Martin Artnik
79b4f0d03d Add display of validation errors to TinyMCE [SCI-8246] 2023-04-03 15:34:59 +02:00
Anton
52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
Martin Artnik
2eb4c2fd9d Enable TinyMCE menu bar on mobile [SCI-8221] 2023-04-03 12:49:04 +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
Anton
babb46baa7 Update webpacker to version 5.4.4 [SCI-7926] 2023-03-28 14:00:28 +02:00
Anton
854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
aignatov-bio
da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Martin Artnik
238354a314 Add back basic TinyMCE html editor [SCI-7965] 2023-02-21 11:23:52 +01:00
artoscinote
8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +01:00
artoscinote
5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934
Fix MarvinJS image toolbar [SCI-7934]
2023-02-17 15:53:27 +01:00
Martin Artnik
fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
Martin Artnik
43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
Martin Artnik
ac9c569b39 Enable Lato font in TinyMCE iframe [SCI-7883] 2023-02-14 14:06:47 +01:00
Martin Artnik
5e63240996 Add image TinyMCE plugin [SCI-7916] 2023-02-13 15:33:56 +01:00
aignatov-bio
6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce
Fix heading styles for tinymce [SCI-7840]
2023-02-07 13:25:02 +01:00
artoscinote
ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
2023-02-07 13:11:03 +01:00
Giga Chubinidze
3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Martin Artnik
d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
artoscinote
5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187
Support compiling webpacker content from addons [SCI-7187]
2023-02-07 10:24:18 +01:00
Martin Artnik
ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +01:00
artoscinote
41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883
Update the TinyMCE font [SC-7883]
2023-02-06 11:19:29 +01:00
Giga Chubinidze
f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Anton
a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01:00
sboursen-scinote
2e037b69ff Fix Hound related issue [SCI-7585] 2023-01-26 09:23:37 +01:00
sboursen-scinote
36cc68f94a Fix Hound related issue [SCI-7585] 2023-01-26 09:20:20 +01:00
sboursen-scinote
95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01:00
sboursen-scinote
b02889c801 Fix the behavior of the clear button [SCI-7585] 2023-01-26 09:03:08 +01:00
sboursen-scinote
15da0f2f33 Remove commented code and change the name of the hide filters method [SCI-7585] 2023-01-26 08:47:55 +01:00
sboursen-scinote
adcb0e84f8 Add close button [SCI-7585] 2023-01-26 08:41:33 +01:00
sboursen-scinote
2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
artoscinote
f72a281e0a
Merge pull request #4850 from artoscinote/ma_SCI_7776
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-19 14:27:19 +01:00
Alex Kriuchykhin
58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-19 13:21:35 +01:00
aignatov-bio
d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:59:20 +01:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
ajugo
d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] (#4859) 2023-01-19 11:39:14 +01:00
Oleksii Kriuchykhin
a6abc9d7e5 Fix icons in custom tinyMCE menu [SCI-7779] 2023-01-18 16:43:50 +01:00
Martin Artnik
b46c92b3c6 Fix navigating away with unsaved TinyMCE changes [SCI-7776] 2023-01-18 11:00:08 +01:00
Martin Artnik
3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
Martin Artnik
33dca201ba Remove placeholder plugin [SCI-7729] 2023-01-11 15:49:18 +01:00
Martin Artnik
b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
Martin Artnik
2ffec1cf49 Fix TinyMCE style loading [SCI-7729] 2023-01-11 15:28:09 +01:00
Martin Artnik
edfc1c4e08 Fix editor close when clicking restore notification [SCI-7729] 2023-01-10 13:24:58 +01:00
Martin Artnik
2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +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
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +01:00
Andrej
884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Andrej
e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Andrej
eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
aignatov-bio
31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-28 11:32:39 +02:00
ajugo
0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
Anton
3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
Anton
2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
Anton
73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
Oleksii Kriuchykhin
557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +02:00
Anton
9b52b7f3db Fix tinymce pack code styling [SCI-7183] 2022-09-08 15:37:23 +02:00
aignatov-bio
7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
Anton
2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton
c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +02:00
Anton
1ebd4046cd Update tinyMCE marvinjs plugin [SCI-7154] 2022-09-06 13:05:56 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385)
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
Anton
31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Anton
8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
artoscinote
6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066)
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
2022-05-03 15:18:48 +02:00
artoscinote
8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote
6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Alex Kriuchykhin
dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote
8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +01:00
artoscinote
39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
aignatov-bio
afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 12:44:22 +01:00
aignatov-bio
24127af83f
Fix dropdown behavior for repository filters [SCI-6491] (#3842)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 11:42:31 +01:00
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
aignatov-bio
e59b18e25d
Add default selection for filters [SCI-6484] (#3826)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 20:58:44 +01:00
aignatov-bio
ec6886735c
Add archived on column [SCI-6482] (#3823)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 13:18:15 +01:00
artoscinote
dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803)
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
2022-02-01 14:37:13 +01:00
aignatov-bio
3fc5883172
Fix purple dots after applying empty filters [SCI-6458] (#3809)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 15:14:39 +01:00
aignatov-bio
60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802)
Co-authored-by: Anton <anton@scinote.net>
2022-01-27 14:01:09 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
aignatov-bio
3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768)
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-01-12 14:39:42 +01:00
Anton
304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote
3f87d250ce
Implement saving repository filters [SCI-6230] (#3748)
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin
738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik
55905310a6 Added filter parameter formatting [SCI-6229] 2021-12-16 14:40:36 +01:00
aignatov-bio
7bcf7a7943
Fix conflicts and update localizations [SCI-6227] (#3733)
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 15:16:12 +01:00
artoscinote
49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
artoscinote
e08857886a
Implement date type filter [SCI-6216] (#3729)
Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
2021-12-10 14:12:06 +01:00
aignatov-bio
c7af5b322b
Add drodown filter [SCI-6224] (#3728)
Co-authored-by: Anton <anton@scinote.net>
2021-12-07 20:49:48 +01:00
aignatov-bio
00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726)
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
2021-12-07 15:28:20 +01:00
aignatov-bio
e4606abf3e
Add basic structure for text filter [SCI-6213][SCI-6214] (#3710)
* Add basic structure for text filter [SCI-6213]

* Add actions for text filter [SCI-6213]

* Add mixins and i18n [SCI-6213]

* Add number filters [SCI-6214]

* Fix operator values

Co-authored-by: Anton <anton@scinote.net>
2021-12-03 14:50:27 +01:00
aignatov-bio
12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698)
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
2021-11-25 20:34:22 +01:00
aignatov-bio
27d6453527
After clear filters not reload table [SCI-6101][SCI-6102] (#3661)
Co-authored-by: Anton <anton@scinote.net>
2021-11-16 14:12:57 +01:00
aignatov-bio
c8fd0dce51
Add permission checks for bmt filters [SCI-6099] (#3622)
Co-authored-by: Anton <anton@scinote.net>
2021-11-09 09:28:51 +01:00
Martin Artnik
2f56e25346 Close saved filters dropdown on outclick [SCI-6086] 2021-11-02 16:23:08 +01:00
Martin Artnik
206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik
5f21e3296e Added error message on search failure [SCI-5961] 2021-08-30 12:02:02 +02:00
Martin Artnik
896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio
b269f3f612 Add saved filters backend [SCI-5977] (#3509)
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
2021-08-30 10:49:15 +02:00
aignatov-bio
90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik
9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
aignatov-bio
958ee92db7 Add BMT filters interactions [SCI-5955] (#3478)
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
2021-08-30 10:49:14 +02:00
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447)
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
2021-07-21 21:32:42 +02:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
aeba25cf09 Fix Hound warning 2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin
25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio
be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
Urban Rotnik
7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Jure Grabnar
fc961b570c Comment out index.jsx
Closes SCI-3590
2019-07-02 18:07:12 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Oleksii Kriuchykhin
88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Urban Rotnik
96fa620c4c Add fontawesome checkmark before dropdown item
SCI-3209
2019-03-26 12:35:17 +01:00
Oleksii Kriuchykhin
7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb
df835fccb4 fix bug with import css styles 2017-11-07 11:09:30 +01:00
Zmago Devetak
a0eaec214b Merge pull request #821 from ZmagoD/zd_SCI_1572
Implement integration test: profile.feature + initial setup
2017-10-20 20:17:37 +02:00
zmagod
e5ebedb428 fix errors with polyfill 2017-10-12 16:49:33 +02:00
mlorb
ed80d849aa remove double css file import and move data-tables style to the component 2017-10-12 14:54:40 +02:00
zmagod
dccf4e34ff fix cucumber settings 2017-10-12 13:50:48 +02:00
zmagod
ce6613ac63 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629 2017-10-03 16:05:45 +02:00
zmagod
55332e2957 adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629] 2017-10-03 16:01:33 +02:00
zmagod
40af99c57f fix hound v2 2017-09-19 13:36:51 +02:00
zmagod
88928be2d3 fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622] 2017-09-19 13:08:08 +02:00
zmagod
015026926d refactor 2017-09-18 15:46:24 +02:00
zmagod
f0a8275559 fixes merge conflicts 2017-09-18 15:36:33 +02:00
zmagod
b9492daa69 fixes changeTeam method 2017-09-18 15:16:07 +02:00
zmagod
d1477179b2 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499 2017-09-18 15:10:52 +02:00
Toni Dezman
39c9b708bd Merge pull request #780 from programmertoni/td_SCI_1565
Td sci 1565
2017-09-18 11:37:19 +02:00
zmagod
40359c5c73 fixed edit name modal 2017-09-15 16:34:05 +02:00
zmagod
83647d81b4 adds edit team name modal 2017-09-15 14:00:48 +02:00
Toni Dezman
d38f4343f2 Decupling redux part 1 2017-09-14 11:46:49 +02:00
zmagod
705d07f60e adds remove team action 2017-09-13 17:11:51 +02:00
zmagod
1b3b3dfea9 adds team members update role functionality 2017-09-12 17:30:13 +02:00
Toni Dezman
1cd9cd92fc adds global spinner 2017-09-11 14:30:49 +02:00
Toni Dezman
67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00