Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 3501bf6
Merge: 1d37a67 020f990
Author: Andrey Vasnetsov <[email protected]>
Date:   Tue Apr 4 16:21:32 2023 +0200

    Merge pull request qdrant#23 from kartik-gupta-ij/new_branch

    Saved Code Feature added

commit 020f990
Author: Kartik Gupta <[email protected]>
Date:   Mon Apr 3 20:27:05 2023 +0530

    local storage varible name change

commit 3339de3
Author: Kartik Gupta <[email protected]>
Date:   Mon Apr 3 20:22:58 2023 +0530

    name fix

commit 3413639
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 21:31:24 2023 +0530

    minor Hight fix

commit 9c8e0a2
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 21:16:38 2023 +0530

    Saved Code Feature added

commit 1d37a67
Merge: 2606681 a95b768
Author: Andrey Vasnetsov <[email protected]>
Date:   Sun Apr 2 15:07:18 2023 +0200

    Merge pull request qdrant#12 from kartik-gupta-ij/History-mode-1

    History Mode 1 (working)

commit a95b768
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 17:02:18 2023 +0530

    fixes

commit 4b324df
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 14:02:03 2023 +0530

    border syles

commit fcc7093
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 03:44:45 2023 +0530

    Update history.js

commit 8d5b4ec
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 03:28:34 2023 +0530

    Layout fixed

commit 765ac10
Merge: 0921fd0 2606681
Author: Kartik Gupta <[email protected]>
Date:   Sun Apr 2 02:32:02 2023 +0530

    Merge branch 'qdrant:master' into History-mode-1

commit 0921fd0
Author: Kartik Gupta <[email protected]>
Date:   Sat Apr 1 23:43:38 2023 +0530

    es lint

commit 47fb7d1
Author: Kartik Gupta <[email protected]>
Date:   Sat Apr 1 21:25:34 2023 +0530

    Check Eslint

commit b2eb641
Merge: bed6378 8dd57ea
Author: Kartik Gupta <[email protected]>
Date:   Sat Apr 1 21:09:38 2023 +0530

    Merge branch 'qdrant:master' into History-mode-1

commit bed6378
Merge: 537d10d c65861e
Author: Kartik Gupta <[email protected]>
Date:   Sat Apr 1 19:51:36 2023 +0530

    Merge branch 'qdrant:master' into History-mode-1

commit 537d10d
Author: Kartik Gupta <[email protected]>
Date:   Sat Apr 1 11:39:17 2023 +0530

    TABLE IN HISTORY

commit 4a12afc
Author: Kartik Gupta <[email protected]>
Date:   Wed Mar 29 16:10:42 2023 +0530

    format

commit e91a036
Author: Kartik Gupta <[email protected]>
Date:   Wed Mar 29 15:26:05 2023 +0530

    Fixes

commit 83c0e5b
Author: Kartik Gupta <[email protected]>
Date:   Wed Mar 29 12:04:25 2023 +0530

    Update src/components/CodeEditorWindow/menu.js

    Co-authored-by: Andrey Vasnetsov <[email protected]>

commit 449954d
Merge: 5670b1f 39d808f
Author: Kartik Gupta <[email protected]>
Date:   Tue Mar 28 23:32:53 2023 -0700

    Merge branch 'qdrant:master' into History-mode-1

commit 5670b1f
Author: Kartik Gupta <[email protected]>
Date:   Wed Mar 29 01:23:07 2023 +0530

    Update menu.js

commit 86a6dfa
Author: Kartik Gupta <[email protected]>
Date:   Wed Mar 29 01:16:46 2023 +0530

    Update menu.js

commit 3168c02
Author: Kartik Gupta <[email protected]>
Date:   Mon Mar 27 16:44:12 2023 +0530

    Update index.js

commit 1499971
Author: Kartik Gupta <[email protected]>
Date:   Mon Mar 27 16:22:17 2023 +0530

    Update ErrorMarker.js

commit 3115517
Author: Kartik Gupta <[email protected]>
Date:   Mon Mar 27 16:09:48 2023 +0530

    History mode

commit 1218cb8
Merge: 23d54e7 c282c36
Author: Kartik Gupta <[email protected]>
Date:   Sun Mar 26 02:48:31 2023 -0700

    Merge branch 'qdrant:master' into History-mode-1

commit 23d54e7
Author: Kartik Gupta <[email protected]>
Date:   Fri Mar 24 12:46:49 2023 -0700

    function done

commit 57ad2d3
Author: Kartik Gupta <[email protected]>
Date:   Fri Mar 24 11:01:37 2023 -0700

    starting working
  • Loading branch information
kartik-gupta-ij committed Apr 5, 2023
1 parent 2606681 commit 3236831
Show file tree
Hide file tree
Showing 11 changed files with 654 additions and 63 deletions.
159 changes: 117 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"@emotion/styled": "^11.10.6",
"@monaco-editor/react": "^4.4.6",
"@mui/icons-material": "^5.11.11",
"@mui/material": "^5.11.10",
"@mui/material": "^5.11.15",
"@mui/x-data-grid": "^6.0.4",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand Down
Loading

0 comments on commit 3236831

Please sign in to comment.