Commit graph

3013 commits

Author SHA1 Message Date
Nikola Ubavic
4d5d883532 fix: capitalize labels 2021-12-28 17:43:33 +01:00
Neal
258d727b1a chore: update zec, xmr, eth versions 2021-12-27 18:39:12 -05:00
Rafael Taranto
5ff676553e Merge pull request #1002 from ubavic/fix/machine_upairing
fix: unpairing machine through dashboard shows blank page
2021-12-27 12:22:18 +00:00
Rafael Taranto
48496b3e18 Merge pull request #1018 from chaotixkilla/fix-customers-page-filters
Fix customers page filter deletion
2021-12-27 12:20:42 +00:00
Rafael Taranto
ccae363784 Merge pull request #1022 from ubavic/fix/machine_table_row
fix: machine table row
2021-12-27 12:20:03 +00:00
Nikola Ubavić
29dc519a52 Merge branch 'dev' into fix/machine_upairing 2021-12-24 23:49:55 +01:00
Nikola Ubavic
6521d45ab5 fix: conflicts 2021-12-24 23:47:31 +01:00
Nikola Ubavic
deef6e52a3 fix: throw error on missing resource 2021-12-24 23:30:25 +01:00
Rafael Taranto
7461a93f7c Merge pull request #1012 from chaotixkilla/fix-cash-cassettes-ui
Add cashbox fiat amount
2021-12-24 09:41:40 +00:00
Rafael Taranto
acdf001796 Merge pull request #1015 from ubavic/fix/ui_changes_system_setting
fix: user and session managment
2021-12-24 09:41:04 +00:00
Rafael Taranto
af5bab4250 Merge pull request #1009 from chaotixkilla/fix-navigation-bar-issues
Fix navigation bar issues
2021-12-24 09:40:28 +00:00
Nikola Ubavic
5b7b342788 fix: machine table row 2021-12-23 19:24:36 +01:00
Sérgio Salgado
e2087d0e4d refactor: unify bill related queries 2021-12-23 16:52:45 +00:00
Sérgio Salgado
98a2797494 feat: add cashin bill counter
fix: fiat amount formatting
2021-12-23 16:50:40 +00:00
Rafael Taranto
219dca7f90 Merge pull request #1014 from chaotixkilla/fix-small-changes-throughout-admin
UI/UX tweaks on compliance related screens
2021-12-23 11:04:28 +00:00
Rafael Taranto
dd09ae5a7e Merge pull request #1013 from chaotixkilla/fix-change-dashboard-ui
Dashboard UI changes
2021-12-23 11:02:58 +00:00
Nikola Ubavic
2033b43b69 fix: use useEfect for focus 2021-12-22 22:02:57 +01:00
Rafael Taranto
d09fd3f98a Merge pull request #991 from SiIky/refact/lam-108/dev/rbf-transactions
refactor: change RBF checkbox wording
2021-12-22 17:29:05 +00:00
Sérgio Salgado
e2abf88705 refactor: pull up method 2021-12-22 16:49:10 +00:00
Sérgio Salgado
50d87e029d fix: alert link icon 2021-12-22 16:39:29 +00:00
Sérgio Salgado
326e395aa0 fix: customers page filter deletion 2021-12-22 15:03:30 +00:00
André Sá
3fc64955b9 refactor: change automatic/manual batch creation option menu text 2021-12-22 12:26:43 +00:00
André Sá
464b3e278a refactor: rename 'Cashbox' to 'Cash box' in the batches module 2021-12-22 11:20:43 +00:00
André Sá
83de7a750d Merge branch 'dev' into refact/lam-108/dev/rbf-transactions 2021-12-22 11:19:55 +00:00
Rafael Taranto
180f4661a8 fix: remove repeated consts 2021-12-22 10:45:10 +00:00
Nikola Ubavic
79c2aa8988 fix: cash cassette wizard autofocus 2021-12-21 18:17:22 +01:00
Rafael Taranto
0ad862fc0e Merge pull request #1005 from RafaelTaranto/chore/merge-release-into-dev-21-16-12
chore: merge release into dev
2021-12-21 17:14:09 +00:00
Rafael Taranto
53d278a376 Merge pull request #1007 from ubavic/chore/remove_unused_columns
chore: hide unused columns on Cash Cassettes History page
2021-12-21 17:12:54 +00:00
Nikola Ubavic
c44e07525a fix: add inverse icons 2021-12-21 17:25:16 +01:00
Nikola Ubavic
b441a0a33e fix: align column 2021-12-21 17:09:50 +01:00
Nikola Ubavic
da89550cee fix: action buttons 2021-12-21 16:54:17 +01:00
Sérgio Salgado
d78594c325 fix: UI/UX tweaks 2021-12-21 15:04:50 +00:00
Sérgio Salgado
454da735a5 feat: add timezone abbreviations 2021-12-21 03:46:52 +00:00
Sérgio Salgado
97f52616cf fix: dashboard UI tweaks 2021-12-20 20:22:12 +00:00
Rafael Taranto
c5f308e7a4 Merge pull request #1010 from ubavic/fix/direction_arrow_on_customer_page
fix: customer details page
2021-12-20 15:01:57 +00:00
Rafael Taranto
453018b333 Merge pull request #994 from chaotixkilla/fix-loading-flags-usage
Fix loading flag usage on admin
2021-12-20 15:01:26 +00:00
Sérgio Salgado
287d2d006b fix: remove redundant conditional 2021-12-20 01:23:28 +00:00
Sérgio Salgado
dfa82e54ae fix: loading usage 2021-12-20 01:23:28 +00:00
Nikola Ubavic
5d58365c87 fix: direction arrow column
fix: action button width
2021-12-17 18:38:07 +01:00
Sérgio Salgado
be7494d7da fix: remove striped background 2021-12-17 17:17:55 +00:00
Rafael Taranto
c641d6d3fa Merge pull request #1008 from chaotixkilla/fix-ua-parser-package
Bump version and move ua-parser-js
2021-12-17 17:10:24 +00:00
Sérgio Salgado
7e93c209f2 fix: ua-parser-js version bump and place in the right package.json 2021-12-17 16:23:19 +00:00
Sérgio Salgado
8ce969ae2c fix: header navigation links
fix: notification center css
2021-12-17 15:47:28 +00:00
Nikola Ubavic
6e3cf93d87 chore: comment out unused fields 2021-12-17 10:52:38 +01:00
Rafael Taranto
c0038a591f Merge pull request #997 from josepfo/fix/get-ui-registration-up-to-spec
fix: font family and default on focus input border
2021-12-16 22:13:40 +00:00
Rafael Taranto
242ba3ad19 Merge pull request #999 from ubavic/fix/unpaired_machine_transactions
fix: transaction history of unpaired machine
2021-12-16 22:12:14 +00:00
Rafael Taranto
a297d0f6f7 Merge pull request #1000 from naconner/change-addresses
feat: send change to bech32 addresses
2021-12-16 22:11:40 +00:00
Taranto
e9b2280fc3 Merge remote-tracking branch 'upstream/release-7.5.0' into chore/merge-release-into-dev-21-16-12 2021-12-16 13:38:43 +00:00
Rafael Taranto
41c7e2a8c1 Merge pull request #1003 from RafaelTaranto/chore/update-lib-version
chore: downgrade lib for apollo compatibility
2021-12-16 12:52:39 +00:00
Taranto
c7dedf313e chore: downgrade lib for apollo compatibility 2021-12-16 12:51:34 +00:00