Commit Graph

  • 661845359e Fix bug with gangs syntax error master Senad Uka 2020-10-21 15:28:46 +02:00
  • 6f655dfe2b Pack up functionality done Senad Uka 2020-10-21 15:11:20 +02:00
  • 25cfc6610c Fix add buttons Senad Uka 2020-10-14 18:13:43 +02:00
  • 0ad9935927 Fix the color of gang selection button: Senad Uka 2020-10-14 07:43:46 +02:00
  • fc32a15f1b Merge branch 'allow-gang-edit' into 'master' Bilal Catic 2020-10-11 22:38:48 +00:00
  • b048cb2392 enable gang rename Bilal 2020-10-10 01:18:57 +03:00
  • 824790c178 add gang details page with rename function Bilal 2020-10-10 01:18:25 +03:00
  • c84ba63984 Merge branch 'redesign-put-in-work' into 'master' Bilal Catic 2020-10-11 22:30:02 +00:00
  • 2ad88ea336 show specific homie details Bilal 2020-10-10 00:35:13 +03:00
  • 6f9fceccd7 redesign put in work Bilal 2020-10-10 00:34:58 +03:00
  • 3b9f097b72 Merge branch 'make-homie-clickable' into 'master' Bilal Catic 2020-10-11 22:23:38 +00:00
  • 4e6c0dbf49 make homie in list of homies clickable Bilal 2020-10-09 23:05:25 +03:00
  • 2e883363fe Merge branch 'fix-bug-long-gang-name' into 'master' Bilal Catic 2020-10-11 22:19:56 +00:00
  • 1e7956d6b1 fix long gang name bug Bilal 2020-10-09 21:31:41 +03:00
  • 1729cbb68d Merge branch 'add-money-move-soft-delete' into 'master' Bilal Catic 2020-10-09 13:22:26 +00:00
  • 63e292c332 handle soft delete of money moves Bilal 2020-10-09 16:15:07 +03:00
  • 722fc71f17 implement soft delete for money moves Bilal 2020-10-09 16:12:44 +03:00
  • f2af0639f3 Merge branch 'fix-modal-dialogs' into 'master' Bilal Catic 2020-10-09 06:04:02 +00:00
  • 7c0a23251e improve modal dialogs Bilal 2020-10-08 23:17:49 +03:00
  • 6da39656f1 Merge branch 'redesign-money-move-v2' into 'master' Bilal Catic 2020-10-08 13:29:00 +00:00
  • 762dc34190 simplify move money page Bilal 2020-10-08 16:23:29 +03:00
  • ff6453e857 simplify move money page Bilal 2020-10-08 16:21:05 +03:00
  • 034c983e3b Merge branch 'move-settle-action-v2' into 'master' Bilal Catic 2020-10-08 07:04:52 +00:00
  • 8ec99343c3 do not change gang on homie details click Bilal 2020-10-08 10:03:59 +03:00
  • 5249fe9629 move settle action to the homie cash flow details Bilal 2020-10-08 09:44:35 +03:00
  • 553df2e50d send money moves on settle action Bilal 2020-10-08 09:44:18 +03:00
  • e25c12c98a Merge branch 'add-support-for-gangs' into 'master' Bilal Catic 2020-10-08 06:25:00 +00:00
  • 9fc4bb6ddb update gang name if already exists Bilal 2020-10-08 01:28:03 +03:00
  • 8cb44e4b16 set default gang name Bilal 2020-10-08 01:18:32 +03:00
  • e65f352108 move homies under gang Bilal 2020-10-08 01:13:57 +03:00
  • 51d8a369a9 implement adding new gang, show only homies for selected gang Bilal 2020-10-08 01:06:51 +03:00
  • 8832ba071b add homie to the gang when homie is created Bilal 2020-10-07 22:47:19 +03:00
  • 8d7716f2e0 Show gang switch Bilal 2020-10-07 22:45:34 +03:00
  • e0c5f60c68 rename original gangsta to gang Bilal 2020-10-07 18:26:59 +03:00
  • b5a70a6e42 Merge branch 'transform-currency-support-v2' into 'master' Bilal Catic 2020-10-06 12:41:28 +00:00
  • cb01467900 do not ask user for currency scale Bilal 2020-10-06 15:34:54 +03:00
  • 7458cd3b75 set scale info for currency Bilal 2020-10-06 15:34:35 +03:00
  • cd88d21a26 show onboarding page when currency is not set Bilal 2020-10-06 14:17:18 +03:00
  • 6fb30209da Show onboarding page if currency is not set Bilal 2020-10-06 14:15:35 +03:00
  • 21f88bd221 Merge branch 'fix-migrations-from-merge-revert' into 'master' Bilal Catic 2020-10-06 07:44:06 +00:00
  • b50c48581c fix merge revert Bilal 2020-10-06 10:36:23 +03:00
  • bb8f20beb7 Merge branch 'show-work-hours-on-dashboard' into 'master' Bilal Catic 2020-10-06 06:59:33 +00:00
  • 30fac52371 fix rebase Bilal 2020-10-06 09:58:09 +03:00
  • 2cff843e88 rebase fix Bilal 2020-10-06 09:55:59 +03:00
  • 3d63a796bd send total work hrs for homie Bilal 2020-10-06 00:17:21 +03:00
  • e608cfd773 show work amount for homie on Dashboard Bilal 2020-10-06 00:16:33 +03:00
  • 1489ad2b8b Merge branch 'allow-not-selecting-to-homie' into 'master' Bilal Catic 2020-10-06 06:46:07 +00:00
  • 4a636c048a handle money move without To homie Bilal 2020-10-05 17:03:37 +03:00
  • a11d517d19 allow not selecting To homie Bilal 2020-10-05 17:02:47 +03:00
  • d832516d14 Merge branch 'allow-entering-custom-amount-to-settle' into 'master' Bilal Catic 2020-10-06 06:43:05 +00:00
  • a141d03475 send homies data on settle Bilal 2020-10-06 09:40:49 +03:00
  • d13e656651 refresh page after settling Bilal 2020-10-06 09:40:33 +03:00
  • 04abd4be78 accept and use custom settle value Bilal 2020-10-05 14:25:42 +03:00
  • 6a6f650538 Allow entering custom settle value in input modal Bilal 2020-10-05 14:25:04 +03:00
  • 51ad1d817e Merge branch 'fix-bug-least-important-homie-not-visible' into 'master' Bilal Catic 2020-10-06 06:34:10 +00:00
  • 363a9ad7c9 show all homies on home screen Bilal 2020-10-05 12:51:38 +03:00
  • 0c8a5ff0ef Merge branch 'fix-bug-delete-homie' into 'master' Bilal Catic 2020-10-06 06:31:00 +00:00
  • ffafdb66ee use correct param name Bilal 2020-10-05 11:24:52 +03:00
  • 45517e869a Merge branch 'revert-cec435f0' into 'master' Bilal Catic 2020-10-06 06:27:10 +00:00
  • fcce2b678f Revert "Merge branch 'transform-currency-support' into 'master'" Bilal Catic 2020-10-06 06:26:23 +00:00
  • cec435f052 Merge branch 'transform-currency-support' into 'master' Senad Uka 2020-09-20 16:03:54 +00:00
  • 9b020238df fix warning Bilal 2020-09-19 02:26:53 +03:00
  • 8f75572b47 handle onboarding and chip selection for Og Bilal 2020-09-18 19:13:04 +03:00
  • a9730dd69a take user to the onboard page if chip is not set Bilal 2020-09-18 19:12:05 +03:00
  • 77469a469b remove default chip from homies - frontend Bilal 2020-09-18 01:30:13 +03:00
  • a8b836b03f remove default chip from homies Bilal 2020-09-18 01:30:01 +03:00
  • c574d77918 Merge branch 'add-put-in-work' into 'master' Senad Uka 2020-09-20 15:25:59 +00:00
  • d683d5be64 fix schema Bilal 2020-09-19 04:51:26 +03:00
  • beabcf66e3 fix bug Bilal 2020-09-19 04:48:06 +03:00
  • ffde784e59 handle adding work for homie Bilal 2020-09-19 04:46:17 +03:00
  • 6e0df8e7b7 Handle adding work for homie Bilal 2020-09-19 04:46:01 +03:00
  • 533ef368cf Merge branch 'add-settle-support' into 'master' Senad Uka 2020-09-17 17:58:25 +00:00
  • 73eb22dbfd fix param name Bilal 2020-09-17 20:23:58 +03:00
  • f459052fcb handle settling records for homie Bilal 2020-09-17 15:00:55 +03:00
  • 0e5682a9a0 Handle click on settle link Bilal 2020-09-17 14:53:19 +03:00
  • 240e01660d Readme bump Senad Uka 2020-09-13 16:23:39 +02:00
  • bffe71f138 Merge branch 'allow-adding-and-removing-homies' into 'master' Senad Uka 2020-09-13 10:16:25 +00:00
  • 013e4d144d handle add/remove homies in backend Bilal 2020-09-12 01:26:56 +03:00
  • 2a5ffac5b9 enable add/remove homie Bilal 2020-09-12 01:17:52 +03:00
  • 3acb5fedf4 Merge branch 'add-list-of-transactions' into 'master' Senad Uka 2020-09-11 09:55:25 +00:00
  • 9ce5ffe1e9 add filter for money moves query Bilal 2020-09-11 12:35:21 +03:00
  • 36968b234c show transactions on homie click Bilal 2020-09-11 12:34:15 +03:00
  • da35c0d9a7 Merge branch 'send-user-to-crib-on-logo-click' into 'master' Senad Uka 2020-09-10 02:06:23 +00:00
  • 52afbcf40b Merge branch 'clear-amount-of-money-after-new-money-move' into 'master' Senad Uka 2020-09-10 02:06:09 +00:00
  • d6a721c5c0 clear amount to move after new money move is created Bilal 2020-09-10 04:53:35 +03:00
  • ea19983d3d Go to the crib on logo click Bilal 2020-09-10 04:46:30 +03:00
  • d9f8624654 Merge branch 'mark-mandatory-fields' into 'master' Senad Uka 2020-09-07 03:30:05 +00:00
  • 66032ac03f improve money move form Bilal 2020-09-04 17:42:01 +03:00
  • a1264a2dac Merge branch 'fix-bug-with-refresh' into 'master' Senad Uka 2020-09-04 11:47:49 +00:00
  • d1120f3e3a ignore build files in protected_public Bilal 2020-09-04 09:27:26 +03:00
  • 20f3159dd8 send unknown routes to the react router Bilal 2020-09-04 09:26:12 +03:00
  • c80ad45133 use scope instead of namespace Bilal 2020-09-04 08:53:13 +03:00
  • 5ac94d7274 add API namespace Bilal 2020-09-04 08:44:06 +03:00
  • 47935d9eda update README Bilal 2020-09-04 08:14:50 +03:00
  • 222b574beb Merge branch 'fix-deploy' into 'master' Senad Uka 2020-09-04 04:50:01 +00:00
  • 98d5c033e0 update README Bilal 2020-09-04 07:46:17 +03:00
  • 85a8fbda4d fix duplicate script keys Bilal 2020-09-04 07:26:05 +03:00
  • fe1c5aff3e Merge branch 'add-support-for-multicurrency' into 'master' Senad Uka 2020-09-04 03:32:06 +00:00
  • 576eb1fad9 Merge branch 'improve-initial-setup-procedure' into 'master' Senad Uka 2020-09-04 03:20:04 +00:00
  • 699ab11bc9 Merge branch 'add-basic-auth' into 'master' Senad Uka 2020-09-04 03:19:50 +00:00