121 Commits

Author SHA1 Message Date
Senad Uka
661845359e Fix bug with gangs syntax error 2020-10-21 15:28:46 +02:00
Senad Uka
6f655dfe2b Pack up functionality done 2020-10-21 15:11:20 +02:00
Senad Uka
25cfc6610c Fix add buttons 2020-10-14 18:13:43 +02:00
Senad Uka
0ad9935927 Fix the color of gang selection button: 2020-10-14 07:43:46 +02:00
Bilal Catic
fc32a15f1b Merge branch 'allow-gang-edit' into 'master'
Allow gang edit

See merge request saburly/gangsta/roraccounting!34
2020-10-11 22:38:48 +00:00
Bilal
b048cb2392 enable gang rename 2020-10-12 01:32:43 +03:00
Bilal
824790c178 add gang details page with rename function 2020-10-12 01:32:43 +03:00
Bilal Catic
c84ba63984 Merge branch 'redesign-put-in-work' into 'master'
Redesign put in work

See merge request saburly/gangsta/roraccounting!33
2020-10-11 22:30:02 +00:00
Bilal
2ad88ea336 show specific homie details 2020-10-12 01:24:26 +03:00
Bilal
6f9fceccd7 redesign put in work 2020-10-12 01:24:26 +03:00
Bilal Catic
3b9f097b72 Merge branch 'make-homie-clickable' into 'master'
make homie in list of homies clickable

See merge request saburly/gangsta/roraccounting!32
2020-10-11 22:23:38 +00:00
Bilal
4e6c0dbf49 make homie in list of homies clickable 2020-10-12 01:20:42 +03:00
Bilal Catic
2e883363fe Merge branch 'fix-bug-long-gang-name' into 'master'
fix long gang name bug

See merge request saburly/gangsta/roraccounting!31
2020-10-11 22:19:56 +00:00
Bilal
1e7956d6b1 fix long gang name bug 2020-10-09 21:31:41 +03:00
Bilal Catic
1729cbb68d Merge branch 'add-money-move-soft-delete' into 'master'
Add money move soft delete

See merge request saburly/gangsta/roraccounting!30
2020-10-09 13:22:26 +00:00
Bilal
63e292c332 handle soft delete of money moves 2020-10-09 16:15:07 +03:00
Bilal
722fc71f17 implement soft delete for money moves 2020-10-09 16:12:44 +03:00
Bilal Catic
f2af0639f3 Merge branch 'fix-modal-dialogs' into 'master'
improve modal dialogs

See merge request saburly/gangsta/roraccounting!29
2020-10-09 06:04:02 +00:00
Bilal
7c0a23251e improve modal dialogs 2020-10-08 23:17:49 +03:00
Bilal Catic
6da39656f1 Merge branch 'redesign-money-move-v2' into 'master'
simplify move money page

See merge request saburly/gangsta/roraccounting!28
2020-10-08 13:29:00 +00:00
Bilal
762dc34190 simplify move money page 2020-10-08 16:23:29 +03:00
Bilal
ff6453e857 simplify move money page 2020-10-08 16:21:05 +03:00
Bilal Catic
034c983e3b Merge branch 'move-settle-action-v2' into 'master'
Move settle action v2

See merge request saburly/gangsta/roraccounting!26
2020-10-08 07:04:52 +00:00
Bilal
8ec99343c3 do not change gang on homie details click 2020-10-08 10:03:59 +03:00
Bilal
5249fe9629 move settle action to the homie cash flow details 2020-10-08 09:44:35 +03:00
Bilal
553df2e50d send money moves on settle action 2020-10-08 09:44:18 +03:00
Bilal Catic
e25c12c98a Merge branch 'add-support-for-gangs' into 'master'
Add support for gangs

See merge request saburly/gangsta/roraccounting!25
2020-10-08 06:25:00 +00:00
Bilal
9fc4bb6ddb update gang name if already exists 2020-10-08 01:28:03 +03:00
Bilal
8cb44e4b16 set default gang name 2020-10-08 01:18:32 +03:00
Bilal
e65f352108 move homies under gang 2020-10-08 01:13:57 +03:00
Bilal
51d8a369a9 implement adding new gang, show only homies for selected gang 2020-10-08 01:06:51 +03:00
Bilal
8832ba071b add homie to the gang when homie is created 2020-10-07 22:47:19 +03:00
Bilal
8d7716f2e0 Show gang switch 2020-10-07 22:45:34 +03:00
Bilal
e0c5f60c68 rename original gangsta to gang 2020-10-07 18:26:59 +03:00
Bilal Catic
b5a70a6e42 Merge branch 'transform-currency-support-v2' into 'master'
Transform currency support v2

See merge request saburly/gangsta/roraccounting!23
2020-10-06 12:41:28 +00:00
Bilal
cb01467900 do not ask user for currency scale 2020-10-06 15:34:54 +03:00
Bilal
7458cd3b75 set scale info for currency 2020-10-06 15:34:35 +03:00
Bilal
cd88d21a26 show onboarding page when currency is not set 2020-10-06 14:17:18 +03:00
Bilal
6fb30209da Show onboarding page if currency is not set 2020-10-06 14:15:35 +03:00
Bilal Catic
21f88bd221 Merge branch 'fix-migrations-from-merge-revert' into 'master'
fix merge revert

See merge request saburly/gangsta/roraccounting!22
2020-10-06 07:44:06 +00:00
Bilal
b50c48581c fix merge revert 2020-10-06 10:36:23 +03:00
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