Commit Graph

80 Commits

Author SHA1 Message Date
Bilal Catic
bb8f20beb7 Merge branch 'show-work-hours-on-dashboard' into 'master'
Show work hours on dashboard

See merge request saburly/gangsta/roraccounting!20
2020-10-06 06:59:33 +00:00
Bilal
30fac52371 fix rebase 2020-10-06 09:58:09 +03:00
Bilal
2cff843e88 rebase fix 2020-10-06 09:55:59 +03:00
Bilal
3d63a796bd send total work hrs for homie 2020-10-06 09:51:03 +03:00
Bilal
e608cfd773 show work amount for homie on Dashboard 2020-10-06 09:49:58 +03:00
Bilal Catic
1489ad2b8b Merge branch 'allow-not-selecting-to-homie' into 'master'
Allow not selecting to homie

See merge request saburly/gangsta/roraccounting!19
2020-10-06 06:46:07 +00:00
Bilal
4a636c048a handle money move without To homie 2020-10-06 09:43:54 +03:00
Bilal
a11d517d19 allow not selecting To homie 2020-10-06 09:43:54 +03:00
Bilal Catic
d832516d14 Merge branch 'allow-entering-custom-amount-to-settle' into 'master'
Allow entering custom amount to settle

See merge request saburly/gangsta/roraccounting!18
2020-10-06 06:43:05 +00:00
Bilal
a141d03475 send homies data on settle 2020-10-06 09:40:49 +03:00
Bilal
d13e656651 refresh page after settling 2020-10-06 09:40:33 +03:00
Bilal
04abd4be78 accept and use custom settle value 2020-10-06 09:34:56 +03:00
Bilal
6a6f650538 Allow entering custom settle value in input modal 2020-10-06 09:34:56 +03:00
Bilal Catic
51ad1d817e Merge branch 'fix-bug-least-important-homie-not-visible' into 'master'
show all homies on home screen

See merge request saburly/gangsta/roraccounting!17
2020-10-06 06:34:10 +00:00
Bilal
363a9ad7c9 show all homies on home screen 2020-10-06 09:32:25 +03:00
Bilal Catic
0c8a5ff0ef Merge branch 'fix-bug-delete-homie' into 'master'
Bug fix - delete homie

See merge request saburly/gangsta/roraccounting!16
2020-10-06 06:31:00 +00:00
Bilal
ffafdb66ee use correct param name 2020-10-06 09:29:36 +03:00
Bilal Catic
45517e869a Merge branch 'revert-cec435f0' into 'master'
Revert "Merge branch 'transform-currency-support' into 'master'"

See merge request saburly/gangsta/roraccounting!21
2020-10-06 06:27:10 +00:00
Bilal Catic
fcce2b678f Revert "Merge branch 'transform-currency-support' into 'master'"
This reverts merge request !14
2020-10-06 06:26:23 +00:00
Senad Uka
cec435f052 Merge branch 'transform-currency-support' into 'master'
Transform currency support

See merge request saburly/gangsta/roraccounting!14
2020-09-20 16:03:54 +00:00
Bilal
9b020238df fix warning 2020-09-20 17:54:12 +02:00
Bilal
8f75572b47 handle onboarding and chip selection for Og 2020-09-20 17:54:10 +02:00
Bilal
a9730dd69a take user to the onboard page if chip is not set 2020-09-20 17:35:48 +02:00
Bilal
77469a469b remove default chip from homies - frontend 2020-09-20 17:32:44 +02:00
Bilal
a8b836b03f remove default chip from homies 2020-09-20 17:32:41 +02:00
Senad Uka
c574d77918 Merge branch 'add-put-in-work' into 'master'
Add put in work

See merge request saburly/gangsta/roraccounting!15
2020-09-20 15:25:59 +00:00
Bilal
d683d5be64 fix schema 2020-09-19 04:51:26 +03:00
Bilal
beabcf66e3 fix bug 2020-09-19 04:48:06 +03:00
Bilal
ffde784e59 handle adding work for homie 2020-09-19 04:46:17 +03:00
Bilal
6e0df8e7b7 Handle adding work for homie 2020-09-19 04:46:01 +03:00
Senad Uka
533ef368cf Merge branch 'add-settle-support' into 'master'
Add settle support

See merge request saburly/gangsta/roraccounting!13
2020-09-17 17:58:25 +00:00
Bilal
73eb22dbfd fix param name 2020-09-17 20:23:58 +03:00
Bilal
f459052fcb handle settling records for homie 2020-09-17 15:00:55 +03:00
Bilal
0e5682a9a0 Handle click on settle link 2020-09-17 14:53:19 +03:00
Senad Uka
240e01660d Readme bump 2020-09-13 16:23:39 +02:00
Senad Uka
bffe71f138 Merge branch 'allow-adding-and-removing-homies' into 'master'
Allow adding and removing homies

See merge request saburly/gangsta/roraccounting!12
2020-09-13 10:16:25 +00:00
Bilal
013e4d144d handle add/remove homies in backend 2020-09-12 01:26:56 +03:00
Bilal
2a5ffac5b9 enable add/remove homie 2020-09-12 01:17:52 +03:00
Senad Uka
3acb5fedf4 Merge branch 'add-list-of-transactions' into 'master'
Add list of transactions

See merge request saburly/gangsta/roraccounting!11
2020-09-11 09:55:25 +00:00
Bilal
9ce5ffe1e9 add filter for money moves query 2020-09-11 12:35:21 +03:00
Bilal
36968b234c show transactions on homie click 2020-09-11 12:34:15 +03:00
Senad Uka
da35c0d9a7 Merge branch 'send-user-to-crib-on-logo-click' into 'master'
Go to the crib on logo click

See merge request saburly/gangsta/roraccounting!9
2020-09-10 02:06:23 +00:00
Senad Uka
52afbcf40b Merge branch 'clear-amount-of-money-after-new-money-move' into 'master'
clear amount to move after new money move is created

See merge request saburly/gangsta/roraccounting!10
2020-09-10 02:06:09 +00:00
Bilal
d6a721c5c0 clear amount to move after new money move is created 2020-09-10 04:53:35 +03:00
Bilal
ea19983d3d Go to the crib on logo click 2020-09-10 04:46:30 +03:00
Senad Uka
d9f8624654 Merge branch 'mark-mandatory-fields' into 'master'
improve money move form

See merge request saburly/gangsta/roraccounting!8
2020-09-07 03:30:05 +00:00
Bilal
66032ac03f improve money move form 2020-09-04 17:42:01 +03:00
Senad Uka
a1264a2dac Merge branch 'fix-bug-with-refresh' into 'master'
Fix bug with refresh

See merge request saburly/gangsta/roraccounting!7
2020-09-04 11:47:49 +00:00
Bilal
d1120f3e3a ignore build files in protected_public 2020-09-04 09:27:26 +03:00
Bilal
20f3159dd8 send unknown routes to the react router 2020-09-04 09:26:12 +03:00