Skip to content
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

rebase and java Chatgpt sample description and tags updated #218

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

dantelmomsft
Copy link
Member

created a new PR to resolve conflicts. please refer to the original PR #193

@hemarina
Copy link
Contributor

LGTM.

@hemarina hemarina merged commit 1770e59 into Azure:main Oct 12, 2023
2 checks passed
hemarina added a commit to hemarina/awesome-azd that referenced this pull request Oct 20, 2023
commit 8daf1cfff3091065dd7a5c730ada751d68bdb151
Merge: 9934f1c 7a314c7
Author: hemarina <[email protected]>
Date:   Wed Oct 18 16:14:38 2023 -0700

    Merge branch 'main' of https://github.com/Azure/awesome-azd into filter-top

commit 9934f1c
Author: hemarina <[email protected]>
Date:   Wed Oct 18 11:52:09 2023 -0700

    add condition for filter

commit 7a314c7
Author: hemarina <[email protected]>
Date:   Wed Oct 18 10:22:11 2023 -0700

    update copyright (Azure#226)

    * update copyright

    * make sure it's for 3 party license

commit 02d76c2
Author: hemarina <[email protected]>
Date:   Tue Oct 17 14:55:05 2023 -0700

    cleaner timer

commit 69e1fb5
Author: hemarina <[email protected]>
Date:   Tue Oct 17 14:32:01 2023 -0700

    add empty search page

commit 055c182
Author: Grace Kulin <[email protected]>
Date:   Tue Oct 17 13:28:30 2023 -0700

    Update video on about page (Azure#221)

    Update video on about page

commit ae0fd84
Author: hemarina <[email protected]>
Date:   Tue Oct 17 13:28:09 2023 -0700

    sort tag and remove dev center (Azure#220)

    sort tag and remove dev center

commit 64740ed
Author: hemarina <[email protected]>
Date:   Fri Oct 13 13:46:20 2023 -0700

    debug filter top bar

commit 97b7cf5
Author: hemarina <[email protected]>
Date:   Fri Oct 13 11:11:50 2023 -0700

    use smaller file png for cover (Azure#219)

    use smaller file png for cover

commit 1770e59
Author: dantelmomsft <[email protected]>
Date:   Fri Oct 13 01:28:32 2023 +0200

    add `azure-search-openai-demo-java` template (Azure#218)

    * rebase and java Chatgpt sample descriptio and tags updated

    * add semantickernel tag

    ---------

    Co-authored-by: hemarina <[email protected]>

commit 09be102
Author: hemarina <[email protected]>
Date:   Thu Oct 12 15:54:31 2023 -0700

    update div css

commit d62bd43
Author: hemarina <[email protected]>
Date:   Thu Oct 12 14:42:35 2023 -0700

    test card sorted

commit 37b09e5
Author: Victor Vazquez <[email protected]>
Date:   Wed Oct 11 16:57:43 2023 -0700

    devcon (Azure#217)

commit c0f73d5
Author: hemarina <[email protected]>
Date:   Wed Oct 11 10:25:21 2023 -0700

    add filter top bar

commit 679e121
Author: hemarina <[email protected]>
Date:   Tue Oct 10 13:54:21 2023 -0700

    Squashed commit of the following:

    commit b838abc
    Author: hemarina <[email protected]>
    Date:   Tue Oct 10 13:50:08 2023 -0700

        add underline when page is selected

    commit 239bd8f
    Author: hemarina <[email protected]>
    Date:   Mon Oct 9 16:18:48 2023 -0700

        custom navbar

commit 1a0e4f5
Author: hemarina <[email protected]>
Date:   Mon Oct 9 13:37:21 2023 -0700

    update submit template link to contribute page (Azure#209)

    update contribute link

commit 79ce05e
Author: hemarina <[email protected]>
Date:   Fri Oct 6 16:51:03 2023 -0700

    Fix bug of showing the wrong template card header logo and title website after filtered and closed contribution card (Azure#206)

    fix bug with unique key in loops
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants