forked from talyaron/fullstack-2021dec-node
-
Notifications
You must be signed in to change notification settings - Fork 0
Grj #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
galgross1
wants to merge
223
commits into
galgross1:main
Choose a base branch
from
talyaron:GRJ
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Grj #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 3818346.
commit 78d4731 Author: hanochshachar <goralot550@gmail.com> Date: Fri Aug 12 19:15:46 2022 +0300 its work commit 24f8b32 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Fri Aug 12 18:43:18 2022 +0300 update-Erev-Shabat commit 5f3408d Merge: edc3e2e d6b54f2 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Fri Aug 12 11:55:31 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit edc3e2e Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Fri Aug 12 11:55:27 2022 +0300 updete app.tsx 12/08/22 commit d6b54f2 Merge: d299c90 7776f95 Author: hanochshachar <goralot550@gmail.com> Date: Fri Aug 12 02:22:19 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit d299c90 Author: hanochshachar <goralot550@gmail.com> Date: Fri Aug 12 02:22:14 2022 +0300 first steps in react commit 7776f95 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Wed Aug 10 22:08:01 2022 +0300 re10-8 commit 55fbd2b Merge: 42201f7 72dfe1d Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Wed Aug 10 21:30:21 2022 +0300 re10-8 commit 42201f7 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Wed Aug 10 21:28:47 2022 +0300 react10/08/22 commit 72dfe1d Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Aug 10 21:04:05 2022 +0300 ... commit a61cbe6 Merge: a0fd3c7 469aba2 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Aug 10 20:55:13 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit a0fd3c7 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Aug 10 20:55:12 2022 +0300 fun style commit 469aba2 Merge: df4fa63 a35ff13 Author: doritgy <63942750+doritgy@users.noreply.github.com> Date: Wed Aug 10 20:37:55 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit df4fa63 Author: doritgy <63942750+doritgy@users.noreply.github.com> Date: Wed Aug 10 20:37:26 2022 +0300 delete double files commit a35ff13 Merge: f17cbb4 0b5ea4d Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Aug 10 20:34:17 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit f17cbb4 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Aug 10 20:34:15 2022 +0300 init react app commit 0b5ea4d Author: Gal <galgross24@gmail.com> Date: Wed Aug 10 20:26:17 2022 +0300 sdf commit 2df53ef Merge: cc09b8b 4dbe054 Author: Gal <galgross24@gmail.com> Date: Wed Aug 10 20:24:28 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit cc09b8b Author: Gal <galgross24@gmail.com> Date: Wed Aug 10 20:24:14 2022 +0300 dsfg commit 4dbe054 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 10 20:17:57 2022 +0300 fixed commit 710833b Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 10 20:12:56 2022 +0300 asdf commit bca7cc9 Merge: 024dd31 ee33d71 Author: YakirD <38473489+yakirdv@users.noreply.github.com> Date: Wed Aug 10 20:12:30 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 024dd31 Author: YakirD <38473489+yakirdv@users.noreply.github.com> Date: Wed Aug 10 20:12:25 2022 +0300 react commit ee33d71 Author: Gal <galgross24@gmail.com> Date: Wed Aug 10 19:47:20 2022 +0300 sdf commit 215297f Merge: 80b660f 8712fbd Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Wed Aug 10 18:43:17 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 80b660f Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Wed Aug 10 18:43:02 2022 +0300 follow10/08/22 commit 8712fbd Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 10 18:42:16 2022 +0300 pre-folloups commit 04ee3c3 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 10 18:10:40 2022 +0300 ex2 cont commit 80cf1fe Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 10 18:10:21 2022 +0300 example2 commit 7adde55 Author: shira <shiraamar44@gmail.com> Date: Wed Aug 10 01:22:46 2022 +0300 css add commit f82c0f5 Merge: 00dee02 b70130b Author: hanochshachar <goralot550@gmail.com> Date: Wed Aug 10 00:50:29 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 00dee02 Author: hanochshachar <goralot550@gmail.com> Date: Wed Aug 10 00:50:03 2022 +0300 gg commit b70130b Author: Katya Rukosuev <72752681+RuKatya@users.noreply.github.com> Date: Tue Aug 9 18:56:03 2022 +0300 react commit 9e569e0 Merge: 22d467e 02bc2bc Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Tue Aug 9 01:04:05 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 22d467e Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Tue Aug 9 01:03:58 2022 +0300 08.08.22 commit 02bc2bc Author: hanochshachar <goralot550@gmail.com> Date: Mon Aug 8 21:40:35 2022 +0300 kk commit 4e30bb1 Author: hanochshachar <goralot550@gmail.com> Date: Mon Aug 8 20:39:31 2022 +0300 its looks like we finish that commit a8ef388 Author: hanochshachar <goralot550@gmail.com> Date: Mon Aug 8 13:51:15 2022 +0300 remove timzon and styling thcoch page commit 66881d1 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Mon Aug 8 10:34:16 2022 +0300 background-repeat commit 0b83eb2 Author: shira <shiraamar44@gmail.com> Date: Sun Aug 7 05:52:18 2022 +0300 select commit 907e2b7 Author: shira <shiraamar44@gmail.com> Date: Sun Aug 7 05:01:53 2022 +0300 add time commit 0f16727 Author: shira <shiraamar44@gmail.com> Date: Sun Aug 7 02:45:32 2022 +0300 add an hour input commit f74ce46 Author: hanochshachar <goralot550@gmail.com> Date: Sun Aug 7 00:44:42 2022 +0300 jj commit d0abd70 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 3 20:33:20 2022 +0300 react start commit 03d7464 Merge: 415cc7e 51e6c19 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 3 18:26:22 2022 +0300 Merge branch 'GRJ' into main commit 51e6c19 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Aug 3 18:25:49 2022 +0300 moving to react commit 415cc7e Author: shira <shiraamar44@gmail.com> Date: Tue Aug 2 23:46:34 2022 +0300 css commit 96b1174 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Tue Aug 2 23:09:34 2022 +0300 2/8/22.gym commit 8b75eb4 Author: shira <shiraamar44@gmail.com> Date: Tue Aug 2 20:40:58 2022 +0300 index.html forms Css commit 9fdd28d Author: shira <shiraamar44@gmail.com> Date: Tue Aug 2 01:09:30 2022 +0300 forms css commit b443c30 Author: Katya Rukosuev <72752681+RuKatya@users.noreply.github.com> Date: Mon Aug 1 21:28:48 2022 +0300 nodejs commit 0abae02 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 31 23:54:02 2022 +0300 start form css commit 625e433 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 31 23:05:22 2022 +0300 kk commit 2557d72 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 31 22:35:10 2022 +0300 hh commit aab7a97 Merge: a4dcbc3 fd484a8 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 31 22:34:54 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit a4dcbc3 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 31 22:31:05 2022 +0300 gg commit fd484a8 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 31 22:13:20 2022 +0300 bcrypt commit f77b075 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 31 20:56:12 2022 +0300 some changes commit abf6a26 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 31 19:32:19 2022 +0300 Dashboard styling css commit 90ec053 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 31 17:29:04 2022 +0300 Implementing ChartJS commit c77af8a Merge: a404321 8e82d84 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 31 09:49:08 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit a404321 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 31 09:49:01 2022 +0300 31/07 commit 8e82d84 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 31 01:57:29 2022 +0300 add Lesson Start date and End date commit 3866649 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 31 01:48:47 2022 +0300 jj commit 8c0fcfb Merge: bc53624 323c516 Author: doritgy <63942750+doritgy@users.noreply.github.com> Date: Sat Jul 30 15:22:33 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit bc53624 Author: doritgy <63942750+doritgy@users.noreply.github.com> Date: Sat Jul 30 15:22:27 2022 +0300 aa commit 323c516 Author: hanochshachar <goralot550@gmail.com> Date: Sat Jul 30 01:03:54 2022 +0300 יי commit eb76950 Author: hanochshachar <goralot550@gmail.com> Date: Sat Jul 30 00:15:35 2022 +0300 fix problems commit f4cfc0b Author: hanochshachar <goralot550@gmail.com> Date: Fri Jul 29 04:27:21 2022 +0300 delete cart commit fc2ee20 Author: hanochshachar <goralot550@gmail.com> Date: Fri Jul 29 03:20:49 2022 +0300 total & delete coach commit a7baa5e Author: shira <shiraamar44@gmail.com> Date: Thu Jul 28 21:41:31 2022 +0300 some changes. commit cfe441e Author: Tal Yaron <tal.yaron@gmail.com> Date: Thu Jul 28 08:19:40 2022 +0300 Revert "we got news!" This reverts commit a99e98f. commit a99e98f Author: Tal Yaron <tal.yaron@gmail.com> Date: Thu Jul 28 08:19:40 2022 +0300 we got news! commit 8e198fa Author: shira <shiraamar44@gmail.com> Date: Thu Jul 28 01:44:08 2022 +0300 add functions commit a3c99c4 Merge: c40eb1f bec9b1c Author: shira <shiraamar44@gmail.com> Date: Thu Jul 28 00:22:44 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit c40eb1f Author: shira <shiraamar44@gmail.com> Date: Thu Jul 28 00:22:41 2022 +0300 start commit bec9b1c Merge: a505c67 f799af3 Author: Bella-UI <85757839+Bella-UI@users.noreply.github.com> Date: Wed Jul 27 22:07:10 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit a505c67 Author: Bella-UI <85757839+Bella-UI@users.noreply.github.com> Date: Wed Jul 27 22:07:05 2022 +0300 . commit f799af3 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 22:06:38 2022 +0300 style css commit d6d7b47 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 20:44:08 2022 +0300 fix commit 36cf9ac Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 19:55:09 2022 +0300 IEX Cloud API - Connected! commit e004df4 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 19:20:45 2022 +0300 all setup commit c96ca52 Merge: d9efd18 8c6a5de Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 18:46:30 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit d9efd18 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Wed Jul 27 18:46:24 2022 +0300 . commit 8c6a5de Author: Bella-UI <85757839+Bella-UI@users.noreply.github.com> Date: Wed Jul 27 18:46:12 2022 +0300 . commit 2c011a6 Author: Bella-UI <85757839+Bella-UI@users.noreply.github.com> Date: Wed Jul 27 18:31:47 2022 +0300 27/07/22 commit c2504a5 Author: Bella-UI <85757839+Bella-UI@users.noreply.github.com> Date: Wed Jul 27 17:51:47 2022 +0300 cleanup commit 4f90cd3 Merge: 0cfa50d dae7e31 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Tue Jul 26 16:37:01 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 0cfa50d Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Tue Jul 26 16:36:58 2022 +0300 25.07.22 commit dae7e31 Merge: 5f81eeb e46038a Author: Tal Yaron <tal.yaron@gmail.com> Date: Mon Jul 25 17:30:17 2022 +0300 Merge remote-tracking branch 'origin/main' into main commit 5f81eeb Author: Tal Yaron <tal.yaron@gmail.com> Date: Mon Jul 25 17:30:14 2022 +0300 בםמא commit e46038a Author: hanochshachar <goralot550@gmail.com> Date: Mon Jul 25 08:05:48 2022 +0300 עע commit d3db43e Author: hanochshachar <goralot550@gmail.com> Date: Mon Jul 25 06:39:54 2022 +0300 server side commit 6ee45f9 Author: hanochshachar <goralot550@gmail.com> Date: Mon Jul 25 05:38:47 2022 +0300 events commit f907452 Author: Marina <garpalion@gmail.com> Date: Mon Jul 25 03:38:05 2022 +0300 mar commit 8e0a978 Merge: d2d2ee1 b609128 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 24 22:51:59 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit d2d2ee1 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 24 22:51:55 2022 +0300 hh commit b609128 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 24 20:40:57 2022 +0300 setup commit 7a81386 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 24 19:43:36 2022 +0300 Creating all the folders for the app commit faa1d92 Merge: ed249f2 aee1129 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 24 19:33:30 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit ed249f2 Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 24 19:33:14 2022 +0300 ff commit aee1129 Merge: 3ae08b0 651cfbd Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 24 19:33:02 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 3ae08b0 Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 24 19:32:55 2022 +0300 init server commit 651cfbd Merge: ddfe888 740cc0b Author: shira <shiraamar44@gmail.com> Date: Sun Jul 24 19:20:46 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit ddfe888 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 24 19:20:37 2022 +0300 coach Login index.ts commit 740cc0b Author: Bella Brail <bellabrailovsky@gmail.com> Date: Sun Jul 24 19:18:56 2022 +0300 Stock market dashboard - start commit 31c2412 Merge: 1f64d78 51e69d0 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 24 18:11:17 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 1f64d78 Author: shira <shiraamar44@gmail.com> Date: Sun Jul 24 18:11:05 2022 +0300 Add coachLogin function commit 51e69d0 Merge: 77cfb8d 38fed25 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Sun Jul 24 18:01:13 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 77cfb8d Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Sun Jul 24 18:00:59 2022 +0300 24.07.22 commit 38fed25 Merge: 3f467da 961697f Author: hadeer57 <hadeer57@hotmail.com> Date: Sun Jul 24 18:00:02 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 961697f Author: hanochshachar <goralot550@gmail.com> Date: Sun Jul 24 17:59:11 2022 +0300 jj commit c8c136e Author: Marina <garpalion@gmail.com> Date: Sun Jul 24 16:45:52 2022 +0300 del commit 5d32e57 Merge: 086e213 6f63c9b Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Sun Jul 24 13:45:53 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 086e213 Author: Meir Duvid Krykun <97189724+Rebmeir770@users.noreply.github.com> Date: Sun Jul 24 13:45:47 2022 +0300 עדכון commit 6f63c9b Author: hanochshachar <goralot550@gmail.com> Date: Fri Jul 22 16:55:14 2022 +0300 handle commit dc0aec1 Author: hanochshachar <goralot550@gmail.com> Date: Fri Jul 22 05:41:47 2022 +0300 html cliant and server for users commit 58b945b Author: Marina <garpalion@gmail.com> Date: Fri Jul 22 00:24:39 2022 +0300 00.20 commit 219a3f4 Author: Marina <garpalion@gmail.com> Date: Fri Jul 22 00:23:50 2022 +0300 del commit 5ea65e8 Author: Marina <garpalion@gmail.com> Date: Thu Jul 21 22:50:03 2022 +0300 tic commit 3f467da Merge: 2053800 0c78b10 Author: hadeer57 <hadeer57@hotmail.com> Date: Thu Jul 21 12:35:02 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 2053800 Author: hadeer57 <hadeer57@hotmail.com> Date: Thu Jul 21 12:34:58 2022 +0300 HW commit d2689a0 Author: hadeer57 <hadeer57@hotmail.com> Date: Thu Jul 21 12:34:43 2022 +0300 HW commit 0c78b10 Author: Gili <gilimena95@gmail.com> Date: Thu Jul 21 09:43:44 2022 +0300 add .env to gitignore commit 4156ec6 Merge: 1400c99 4c289ee Author: Gili <gilimena95@gmail.com> Date: Thu Jul 21 09:04:17 2022 +0300 Merge branch 'main' of https://github.com/talyaron/fullstack-2021dec-node commit 4c289ee Merge: cc15594 2d2f280 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Jul 20 20:29:16 2022 +0300 Merge remote-tracking branch 'origin/main' into main commit cc15594 Author: Tal Yaron <tal.yaron@gmail.com> Date: Wed Jul 20 20:26:00 2022 +0300 cont commit 1400c99 Author: Gili <gilimena95@gmail.com> Date: Wed Jul 20 18:33:26 2022 +0300 ws
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
כעטי