Commit graph

175 commits

Author SHA1 Message Date
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Ivan Kljun
f9e5821361 Replace bootstrap_form_tag with form_with at _destroy_modal.html.erb [SCI-9039] 2023-08-10 11:16:43 +02:00
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
Martin Artnik
f1173661f5 Fix forms [SCI-9004] 2023-08-09 15:47:33 +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
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975]
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
2023-08-04 12:34:04 +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
Andrej
37d8ac6cd6 Fix shareable links after develop merge 2023-07-20 09:39:17 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
artoscinote
fc7a04d0f9
Merge pull request #5649 from G-Chubinidze/gc_SCI_7524
Settings - My preferences - Date formats appear duplicated [SCO-7524]
2023-07-03 14:49:40 +02:00
Anton
b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Anton
e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
Giga Chubinidze
e77e2813bd Settings - My preferences - Date formats appear duplicated [SCO-7524] 2023-06-22 11:09:27 +04:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Soufiane
f3dcef44ac
Show checkmark on selected user role only [SCI-8699] (#5636)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-21 08:12:31 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
G-Chubinidze
0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
Giga Chubinidze
88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +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
Anton
45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
sboursen-scinote
1624941c03 Fix CSS issues label printer and label templates and setting pages [SCI-8371] 2023-05-09 14:07:53 +02:00
Anton
5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
Soufiane
937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854)
Update Invite new user to team modal [SCI-6007]
2023-02-01 16:27:50 +01:00
ajugo
ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
Alex Kriuchykhin
db0a5ede84
Merge pull request #4462 from okriuchykhin/ok_SCI_7240
Fix user adding/removing from a team [SCI-7240]
2022-09-27 10:30:35 +02:00
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463)
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]

* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
Oleksii Kriuchykhin
b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310)
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
Oleksii Kriuchykhin
c5c3afa906 Update team users table with new user assignments [SCI-6842] 2022-06-01 15:06:19 +02:00
Oleksii Kriuchykhin
6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Miha Mencin
fd54704d3e SCI-6271 Allow giot_connect to be shown in connected accounts 2021-12-15 14:17:51 +01:00
Martin Artnik
3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Martin Artnik
3a70aadea4 Added specific html class to printer settings section [SCI-6039] 2021-09-02 09:52:52 +02:00
artoscinote
c977decd8a
Merge pull request #3496 from aignatov-bio/ai-sci-5950-fix-webhook-position-in-menu
Fix webhook sidebar position and fix texting in inventory [SCI-5950]
2021-08-20 11:05:15 +02:00
aignatov-bio
dc192ddbfb Fix webhook sidebar position and fix texting in invnetory [SCI-5950] 2021-08-19 14:23:53 +02:00