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.

Sign up for GitHub

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

Jump to bottom

Lucas staging com #1838

Merged
merged 37 commits into from
Aug 6, 2024
Merged

Lucas staging com #1838

merged 37 commits into from
Aug 6, 2024

Conversation

LucasWyski001
Copy link

Update to be the same as Master branch

RETprojects and others added 19 commits January 28, 2024 09:57
@RETprojects
Made idea owner element in Styled Comments
25b66cd
@RETprojects
Changed username check to id check
e5f83e9
@RETprojects
Added a try-catch clause to submit comments
b4a18aa
@Hindu-Priya
Updating Changes acc. to #788
dbb90c0
@RETprojects
Attempted to correct environment file
b62a80e
@dbradhamBanyan
Merge branch 'development/ideaspace' into RETprojects/ideaOwnerLabel
9eb8c0c
@dbradhamBanyan
fix(use populate=deep to get relevant items for comments)
b4d2f2c
@dbradhamBanyan
fix(handle new user data format for comment authors)
312f793
@dbradhamBanyan
fix(use author instead of user.email for display on comments)
5865709
@dbradham
Merge pull request #1804 from dev-launchers/dbradham/CommentTweaks
8d1932e 
Dbradham/comment tweaks
@Hindu-Priya
Imported Tailwind CSS into IdeaCardTag
3344d68
@dbradhamBanyan
fix(revert changes for tailwind on idea card tag)
1923da9
@dbradham
Merge pull request #1808 from dev-launchers/ideaspace/ideaTagColors
2f301a1 
fix(revert changes for tailwind on idea card tag)
@dbradham
Merge branch 'master' into UpdatingColors
15d5f4d
@Hindu-Priya
Trying to style tags with TailWind CSS
08d09b0
@Enjoy2Live
fix tokens class case
932902c
@RETprojects
Can post with display name on new ideas
0697f7f
@Hindu-Priya
Styled Tags with Tailwind CSS
d4c8b1e
@Hindu-Priya
Removed direct modifications to props.
5b8e246
@LucasWyski001 LucasWyski001 requested review from Enjoy2Live, pyxld-kris and a team as code owners June 27, 2024 22:46
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Jun 27, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: 36264e1

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Enjoy2Live
Enjoy2Live reviewed Jun 29, 2024
View reviewed changes
Copy link
Member

@Enjoy2Live Enjoy2Live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the propose of this PR? development/community is already at the same state as lucasStagingCom

RETprojects and others added 12 commits June 29, 2024 15:33
@RETprojects
Deleted unnecessary try-catch block and import
4027b78
@RETprojects
Proper display name shows in navbar when logged in
a34963b
@RETprojects
Merge branch 'development/ideaspace' into RETprojects/ideaOwnerLabel
38035bb
@dbradham
Merge pull request #1843 from dev-launchers/ideaspace/705-DashboardLa…
e9f45a1 
…bels

fix(update label in dashboard page for 'mine' ideas)
@fluxcdbot
Upgrade staging image to devlaunchers/platform-website:e9f45a1-202406…
7f830ab 
…300106
@RETprojects
Merge pull request #1842 from dev-launchers/RETprojects/ideaOwnerLabel
57b0adf 
Refresh comment feed
@dbradham
Merge pull request #1846 from dev-launchers/development/ideaspace
3f076a5 
Development/ideaspace
@fluxcdbot
Upgrade staging image to devlaunchers/platform-website:3f076a5-202406…
2d2ecce 
…302003
@Enjoy2Live
chore(components): added issue template for submitting UI component r…
325ccc7 
…equests
@fluxcdbot
Upgrade staging image to devlaunchers/platform-website:325ccc7-202407…
d3fe0e5 
…021211
@l1keafox @fluxcdbot
feat(components): Popover component (#1723)
be2af19 
* Upgrade staging image to devlaunchers/platform-website:38b624e-202401311908

* Upgrade staging image to devlaunchers/platform-website:2536d7d-202402160803

* Upgrade production image to devlaunchers/platform-website:2.15.0

* draft

* Saving for push

* added Popover.mdx

* added examples and anatomy with details

---------

Co-authored-by: fluxcdbot <fluxcdbot@users.noreply.github.com>
@Enjoy2Live
Merge branch 'master' into development/components
ff54165
@chungthuang
Copy link
Contributor

@Enjoy2Live we were trying to rebase the development and staging branches. I found this issue https://github.com/dev-launchers/dev-launchers-platform/pull/1839/files. Can you advise what is the correct way to rebase?

@Enjoy2Live Enjoy2Live changed the base branch from staging/community to development/community July 11, 2024 20:07
@Aishwaryak01 Aishwaryak01 merged commit e287153 into development/community Aug 6, 2024
7 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Enjoy2Live Enjoy2Live Enjoy2Live left review comments

@pyxld-kris pyxld-kris Awaiting requested review from pyxld-kris pyxld-kris is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@LucasWyski001 @chungthuang @Enjoy2Live @Aishwaryak01 @RETprojects @Hindu-Priya @dbradhamBanyan @dbradham @fluxcdbot @l1keafox