Commit graph

378 commits

Author SHA1 Message Date
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
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +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
Soufiane
a1e32e0c3d
Profile - 2FA error page [SCI-8779] (#5734)
* Fix 2FA form submit [SCI-8779]
2023-07-11 09:22:42 +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
G-Chubinidze
7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02: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
Soufiane
30c5b1675f
Missing warning messages when setting up new user [SCI-8595] (#5548)
* Fix form errors in users invitation edit [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users confirmation new [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users registration [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-02 15:35:29 +02:00
Anton
45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
Soufiane
c28f86d46d
Refactor inline events [SCI-8434] (#5403)
Refactor inline events in task results [SCI-8434]
2023-05-16 09:34:36 +02:00
artoscinote
df8a380a87
Merge pull request #5386 from sboursen-scinote/sb_SCI-8371
CSS: label printer part 1 [SCI-8371]
2023-05-15 13:17:17 +02:00
Oleksii Kriuchykhin
f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +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
560ddca839 Add html support to disclaimer body and enable during registration [SCI-8410][SCI-8407] 2023-05-05 10:44:22 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] (#5206)
CSP and inline js refactor [SCI-8118][SCI-8119]
2023-05-03 11:31:17 +02:00
Anton
8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
Anton
5ad0d1c593 Small fixes for horizontal scrollbar [SCI-8269] 2023-04-12 15:23:35 +02:00
Giga Chubinidze
1d44eea8cf updated device table stylings 2023-04-10 23:57:43 +04:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
ajugo
f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
ajugo
fe37699ba5
Add switch for connected devices [SCI-8112] (#5179) 2023-03-22 12:15:01 +01:00
ajugo
8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
G-Chubinidze
06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01: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
ajugo
914cd3c2c8
Fix the eye icon on disable 2fa modal [SCI-7528] (#4906) 2023-02-06 11:17:57 +01:00
Oleksii Kriuchykhin
8eafe0fd4a Fix Azure and Okta sign in links [SCI-7764] 2023-02-02 11:20:02 +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
Oleksii Kriuchykhin
e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin
94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
Alex Kriuchykhin
e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
Giga Chubinidze
a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
Andrej
41362f300e Implement 2fa screen after sign in [SCI-7612] 2022-12-21 11:59:25 +01:00
aignatov-bio
4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms
Fix css issues for login and signup forms [SCI-7233]
2022-11-10 11:15:03 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +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
Anton
689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +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
Andrej
ec77c2a076 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027 2022-09-16 10:44:07 +02:00
Andrej
ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +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
Anton
f84a972f6a Fix show password for invitation/password reset screens [SCI-6791] 2022-06-09 11:40:22 +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
ajugo
02677aaaba
Focus authenticator code field [SCI-6716] (#4022) 2022-04-14 15:17:56 +02:00
Miha Mencin
fd54704d3e SCI-6271 Allow giot_connect to be shown in connected accounts 2021-12-15 14:17:51 +01:00
Alex Kriuchykhin
f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193
Added optional webhook secret key [SCI-6193]
2021-11-08 21:00:40 +01:00
Martin Artnik
3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin
47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
aignatov-bio
a93f2889b7 Fix 2fa redirecting [SCI-6103] 2021-09-28 12:34:41 +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
aignatov-bio
bbb6cd226b
Add permission check for webhooks sidebar button [SCI-6016] (#3493) 2021-08-19 12:04:52 +02:00
aignatov-bio
852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486)
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
2021-08-16 10:51:46 +02:00
aignatov-bio
cfa7937f88 Cancel changes after exit webhook edit mode [SCI-5964] 2021-08-05 12:44:01 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
Martin Artnik
a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
aignatov-bio
43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
Martin Artnik
110ddd872e Added placeholder FLUICS printer setup 2021-07-23 14:56:21 +02:00
Martin Artnik
b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
aignatov-bio
f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450)
* Add printers to addon page [SCI-5904]

* Fix markup
2021-07-21 13:48:38 +02:00
Martin Artnik
0c63013d8b Made 2fa enable modal accessible globally [SCI-5856] 2021-07-05 16:50:37 +02:00
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Oleksii Kriuchykhin
b132a13698 Fix user preferences date format selector [SCI-5815] 2021-06-15 11:15:46 +02:00
Martin Artnik
380473c825 Fixed emails for successful report file generation [SCI-5814] 2021-06-14 13:25:50 +02:00
aignatov-bio
afe2a19c88
Add webhooks management [SCI-5767] (#3376)
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
2021-06-09 12:53:11 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
aignatov-bio
f98aad5853 Fix nit issue in team description [SCI-5700] 2021-05-29 23:10:48 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
miha
ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00