-
-
Notifications
You must be signed in to change notification settings - Fork 206
Merging Reactime v26.0 into main oslabs repo #353
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
Closed
Closed
Changes from all commits
Commits
Show all changes
292 commits
Select commit
Hold shift + click to select a range
b1b2ebb
fixed ts error on MainSlider
pinardo88 9ad19c6
removed MainSlider
pinardo88 bcd1cba
merged with current dev, working state
pinardo88 7bb8211
Merge pull request #7 from oslabs-beta/PatriceFeature
pinardo88 c55b13f
moved slider into each route component
pinardo88 0f0b00e
removed unnecessary flexbox and div
pinardo88 98498ab
Merge pull request #8 from oslabs-beta/PatriceFeature
pinardo88 d2864e6
styled the clear button
garrettlchow db39cb3
Merge branch 'dev' into feature/ellie
elliesimens 10950e8
garrettlchow 3566580
fix reflow/ repaint issue on snapshots
pinardo88 2b0aec0
Merge pull request #9 from oslabs-beta/PatriceFeature
pinardo88 1efadc0
removed cartesian versus polar view due to polar view being nonfuncti...
elliesimens dfa5eb6
Merge branch 'dev' into feature/ellie
elliesimens cd86f25
styled clear button and route description header
garrettlchow 8864b70
Merge branch 'dev' into feature/garrett
garrettlchow 4c1c412
adjusted for fixed siwth of action container
garrettlchow d5183ba
Merge pull request #10 from oslabs-beta/feature/ellie
elliesimens e79c3c1
fixed snapshot naming and current status of snapshots
garrettlchow 717f87d
styled the actions in snapshots, working on slider
garrettlchow 46549c8
styled slider thumb
garrettlchow eaeb8a7
finished styling for slider and jump/current buttons
garrettlchow d955152
started styling collapse
garrettlchow 5d933c4
Merge branch 'dev' into feature/garrett
garrettlchow f6eaf44
removed override reducer code and updated version number to 26
garrettlchow 72fa443
Merge pull request #11 from oslabs-beta/feature/garrett
garrettlchow 9c4491b
removed current tab
garrettlchow 145eb4e
styled collapse arrow
garrettlchow a1a08bb
styled record text and added red circle
garrettlchow 7e472a2
styled record toggle
garrettlchow 8a1631e
aligned collapse arrow
garrettlchow aa1a2b1
switched record toggle off ot gray
garrettlchow 97fd9f1
Provider/Consumer display complete
ragad-mohammed 161bd5f
Merge branch 'dev' into click-tab/ragad
ragad-mohammed bc71bea
moved travel container and buttons container next to each other on th...
garrettlchow d08c871
styled buttons in buttons container
garrettlchow 5cd0ef9
updated using lucide-react icons
garrettlchow 63573cb
styled reconnect green dot
garrettlchow 972bc58
removed heat-map-legend container
garrettlchow ba6c07c
Merge pull request #5 from oslabs-beta/click-tab/ragad
ragad-mohammed eec0cb1
working on styling react-select
garrettlchow 5ee3365
Merge branch 'dev' into feature/garrett
garrettlchow 5bc2dc1
Merge pull request #12 from oslabs-beta/feature/garrett
garrettlchow 6ee75ad
styling prov/con container
ragad-mohammed b2770d3
Merge branch 'dev' into click-tab/ragad
ragad-mohammed 61c3e41
made buttons in buttons container flex to container size for larger s...
garrettlchow 29b9284
began styling navbar
garrettlchow af04286
cleaned up some unused styling
garrettlchow e7c9536
fixed collapse function with fixed action container width
garrettlchow 2c41358
changed the default component map view from diagonal to step view, an...
elliesimens 3e4453a
Merge pull request #13 from oslabs-beta/feature/ellie
elliesimens 983f275
updated reconnection logic to further correct loss of port connection...
elliesimens a8e59dd
removed state and diff buttons
garrettlchow b9d2639
Merge pull request #14 from oslabs-beta/feature/ellie
elliesimens f21fb35
further corrected reconnection logic
elliesimens dfa8329
finished styling navbar
garrettlchow 1f9d2c1
Merge branch 'dev' into feature/garrett
garrettlchow 6efed94
Merge pull request #15 from oslabs-beta/feature/garrett
garrettlchow 2797416
removed duplicate main-navbar-container
garrettlchow 1ad0514
adjusted padding for current snapshot
garrettlchow 2795c6d
cleaned up alot of code
garrettlchow 29203cd
removed head contrainer
garrettlchow 958140a
Merge pull request #16 from oslabs-beta/feature/garrett
garrettlchow 9bb43dc
fixed tutorial for map tab
garrettlchow 61cbc29
prov/con container complete
ragad-mohammed 38c2157
Merge branch 'dev' into click-tab/ragad
ragad-mohammed 0d2decc
Merge pull request #17 from oslabs-beta/click-tab/ragad
garrettlchow 66acd36
Merge branch 'dev' into feature/garrett
garrettlchow 5fc0a63
switched component map for presentation
garrettlchow c3bb351
styled link controls
garrettlchow 4382f7c
added responsive styling for container size for link controls
garrettlchow b442626
deleted extra slider styling
garrettlchow a1110a0
removed rendering frequency styling sheet
garrettlchow d957939
removed old override files
garrettlchow 9b7a65e
styled tree a little more
garrettlchow a1c7488
styled component map to white nodes and light gray background
garrettlchow 6703afa
updated color sceheme for links and root
garrettlchow 218b5d8
fixed collapse for root node
garrettlchow 49a64df
Merge branch 'dev' into feature/ellie
elliesimens e6125c2
Merge pull request #18 from oslabs-beta/feature/ellie
elliesimens 825cdef
adjusted color scheme for node links
garrettlchow 6824840
resolved merge conflicts
garrettlchow 04ddaab
fixed aspect ratio for initial loading of app
garrettlchow 7f628b3
began styling tool tip display
garrettlchow 788104d
changed null color to red
garrettlchow 22f9055
moved all information into one tool tip display
garrettlchow deb1d8a
fixed padding for tool tip display
garrettlchow 1e187c8
added function to only show tool tip display when there there are pro...
garrettlchow e4419ec
finished styling tool tip display
garrettlchow 95ed895
swapped to a white color scheme
garrettlchow d5f3d1e
Merge pull request #19 from oslabs-beta/feature/garrett
garrettlchow 1914fea
added nesting for deeply nested properties
garrettlchow af9851b
filtered link select for context hooks
garrettlchow 52648bb
began styling performance controls
garrettlchow 3eb2fdf
adjsuted width of tool tip display
garrettlchow d156496
cleaned up styling code
garrettlchow e96421e
finished styling performance tab
garrettlchow 75affe7
truncated long node names with ellipses
garrettlchow a9689de
added alarms permissions in manifest chrome
garrettlchow 12f942e
began styling the web metrics need to fix hover effect
garrettlchow 7ca9ec9
added auto scroll for snapshots
garrettlchow f86eb5c
began styling history nodes
garrettlchow 1c882fc
styled d3 tree in history need to style tool tip hover
garrettlchow d7c817b
remove tool tip hover for first snapshot in history link
garrettlchow 67d00d9
Merge pull request #20 from oslabs-beta/feature/garrett
garrettlchow f8eaed7
styled history nodes into rects
garrettlchow a01d644
moved text fromtool tip hover into history nodes
garrettlchow fb681ba
added null checks for checkDiff in history tree
garrettlchow 882823f
removed scrolling for map and perforamnce and added scrolling for tre...
garrettlchow d96d5a9
history nodes styled, working on state properties that are objects
garrettlchow 5cda6fe
added scroll bar for history nodes
garrettlchow 1c276e3
ax tree functional
ragad-mohammed a593a57
Merge branch 'dev' into axMap-update
ragad-mohammed 0efea9b
Merge pull request #21 from oslabs-beta/axMap-update
ragad-mohammed 22fd64f
Merge branch 'dev' into feature/garrett
garrettlchow 1b2140b
finished styling history tab
garrettlchow 435a0a1
styled ax buttons need to move other buttons
garrettlchow 034a11b
began styling ax controls
garrettlchow d5883b8
removed ax legend button
garrettlchow bac5f56
added reducer state data to tool tip display
garrettlchow 78703ac
removed axlegend files and reducer
garrettlchow 0019d3f
made ax tree nodes less round
garrettlchow 36d64a6
Merge pull request #22 from oslabs-beta/feature/garrett
garrettlchow 0fcdfb6
finished styling provider consumer panel and added hover tool tip dis...
garrettlchow 951682c
added max height for tool tip display
garrettlchow 1f25046
adjsuted aspect ratio for component map
garrettlchow 13c25e3
started ax tree tool tip display hover
garrettlchow 2117bcd
finished styling ax tool tip display
garrettlchow b632e23
finished style ax tab
garrettlchow 60abeaa
began styling reconnect dialog popup
garrettlchow c9c9c44
Merge pull request #23 from oslabs-beta/feature/garrett
garrettlchow 0dcb068
cleaned up some files
garrettlchow c6f3f75
added disable ax button
garrettlchow f2d5dd8
fixed web metrics tool tip display
garrettlchow 1f185e5
Co-authored-by: pinardo88 <pinardo88@users.noreply.github.com>
dryczek01 bf67b20
added ellie's fix for sending snapshots to reactime after re-opening
garrettlchow b6a537f
Merge pull request #25 from oslabs-beta/feature/garrett
garrettlchow d508696
fixed pause/ play logic
pinardo88 42e5672
sync slider movement with play/ pause
pinardo88 1ea5912
Merge pull request #26 from oslabs-beta/PatriceFeature
pinardo88 08c39d5
Tutorial needs updated dev code
dryczek01 b813c22
began styling travel buttons
garrettlchow 9e48e06
removed unused errorHandler file
garrettlchow 121b2c1
began style error container
garrettlchow a70ffc6
Merge branch 'dev' into daniel
dryczek01 1433558
Only accessibility tab needs to be fixed
dryczek01 3e8edcf
Merge pull request #27 from oslabs-beta/daniel
dryczek01 7bde26b
Merge branch 'dev' into feature/garrett
garrettlchow 49b69e8
began styling play button
garrettlchow 998f53e
finally finished styling current shapshot button
garrettlchow 5ea7847
removed reconnect dialog and replaced with hot toast notification
garrettlchow 7cdcad5
removed old reverse and fast forward code
garrettlchow 74cc04d
beagn styling tutorial
garrettlchow e778fc0
fixed sass warning messages using deprecated code
garrettlchow a091920
updated sass and sass loader in package.json to fix warnings
garrettlchow d14f327
Merge pull request #28 from oslabs-beta/feature/garrett
garrettlchow 1b4709d
removed button controls from action container
garrettlchow a1b4119
removed collapse function
garrettlchow ca8ed40
added dark mode icon
garrettlchow 2d4e18b
styled dark mode slider
garrettlchow 05d796c
added varibles for colors
garrettlchow 4f8b852
continued styling dark mode
garrettlchow f454891
added dark styles for link controls
garrettlchow e6a4f07
added dark mode for ax tree
garrettlchow 7f85f74
changed string trext color to be visible in dark mode
garrettlchow c851c05
finished adding dark mode to everything except bar graph and react dr...
garrettlchow 9ff8fc8
styled both drop downs
garrettlchow 1fa5e0b
finished styling bar graph
garrettlchow f201e3d
Merge pull request #29 from oslabs-beta/feature/garrett
garrettlchow 7c6a416
styled current location button
garrettlchow 4b1e2ce
added transparent background to tool tip displays
garrettlchow 6eb4162
styled web metrics and moved history to second position
garrettlchow 77970fe
added transprent background to ax tree tool tip display
garrettlchow 94ee09c
styled enable button
garrettlchow 68c64ee
added styling to the sun in light mode in theme toggle
garrettlchow 5bedb62
added styling for jump button hover
garrettlchow e804515
added auto scroll for history link
garrettlchow 7b8b70c
adjusted component map size and added port disconenct listerner logic...
garrettlchow 52d1b97
adjusted positioning of bar graph and ax tree
garrettlchow 4da2415
added invalid payload checks
garrettlchow 6addc91
added hook state for providers in provCon container
garrettlchow f73612e
fixed web metrics hover error
garrettlchow 18b0574
fixed invalid color in web metrics
garrettlchow eb33407
Merge pull request #30 from oslabs-beta/feature/garrett
garrettlchow b68608a
updated acitons test
garrettlchow 5e3e6b2
removed irrelevant frontend test files
garrettlchow 268032d
added more actions buttons tests working on theme toggle tests
garrettlchow 0907893
finished adding unit tests for actions buttons, could not pass theme ...
garrettlchow 55564f9
passed all vertical slider tests
garrettlchow e6680df
passed all time travel tests
garrettlchow 9fccebf
buttons container tests all passing
garrettlchow ccf3fd5
updated testing for main container
garrettlchow db0d9a4
updated travel container tests
garrettlchow 6fe1268
updated tutorial testing
garrettlchow 10255dc
added tests for performance
garrettlchow a77bd53
completed performance tests
garrettlchow 41eb204
completed web metrics tests
garrettlchow c5e9f74
added state container tests
garrettlchow a902d6e
minor updates to backend testing
garrettlchow 435f1c1
Merge pull request #31 from oslabs-beta/feature/garrett
garrettlchow e42051b
completed state container tests
garrettlchow f731403
updated styling for demo tic tac toe app
garrettlchow 0611e70
Tutorial Done
dryczek01 ea92b93
Merge pull request #32 from oslabs-beta/feature/garrett
garrettlchow 1d5454b
reverted disconnection changes to background and content script
garrettlchow 4bccc0f
Merge pull request #33 from oslabs-beta/feature/garrett
garrettlchow dc55f43
fixed connection issue
elliesimens ee0fa72
update README
pinardo88 2a77b89
Merge branch 'dev' into daniel
dryczek01 00f947d
Small fix on Tutorial
dryczek01 d5c667c
Merge pull request #34 from oslabs-beta/daniel
dryczek01 038a15b
reverted error container
garrettlchow 2a78823
removed all urls matches for content scripts in chrome manifest
garrettlchow 3fd54d8
added some styling to old error container
garrettlchow 41024f0
Merge pull request #35 from oslabs-beta/feature/garrett
garrettlchow f90943e
update icons
pinardo88 20c8eee
Merge pull request #36 from oslabs-beta/PatriceFeature
pinardo88 62a527d
reverted main and error container, reverted background and content sc...
garrettlchow 78ef183
updated logos in chrome extension
garrettlchow 16365c1
updated reconnection logic
garrettlchow ba6de31
update readme
pinardo88 7dfb6e2
Merge pull request #37 from oslabs-beta/pls-work
pinardo88 fe9e0f7
fixed connection issues with further edge casing
elliesimens ffe67f4
added more logic to maintain localhost lock in chrome
garrettlchow cc571a0
Merge pull request #38 from oslabs-beta/pls-work
garrettlchow ea3f0d6
reduced size of dark theme toggle
garrettlchow b62af49
added dark theme toggle and reconnect button to tutorial
garrettlchow 8b74347
updated hover event for main nav bar
garrettlchow 33c264c
updated developer README
garrettlchow be59972
updated developer read me link in read me
garrettlchow 1525171
moved asset files
garrettlchow 6fcf2df
added v26 gifs to README
garrettlchow 83c7763
reworked README with icons
garrettlchow e4d3a6f
added more icons
garrettlchow 872cc45
updated new features of README
garrettlchow 6487b6f
updated getting started section of README
garrettlchow 016f34b
added more spacing for sections
garrettlchow 688ad9f
updated french README
garrettlchow a89ea2d
updated different language READMEs
garrettlchow 999a52f
fixed formatting for russian README'
garrettlchow 40f5fec
added medium article link
garrettlchow c784f3c
updated formating for medium article link
garrettlchow fcb4bf2
made medium link header
garrettlchow 47bafae
added link to CONTRIBUTING.md
garrettlchow 55f12d2
added missing tag to contributing
garrettlchow f82426c
removed unused error handlers
garrettlchow c47adf0
removed context menus permissions in chrome manifest
garrettlchow 17ae1e8
Merge pull request #39 from oslabs-beta/pls-work
garrettlchow 0d0f4bb
updated README to remove context mnenu option
garrettlchow 8ea4ab3
Merge pull request #40 from oslabs-beta/dev
garrettlchow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
14 changes: 0 additions & 14 deletions
.travis.yml
Oops, something went wrong.
119 changes: 77 additions & 42 deletions
CONTRIBUTING.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,107 @@ | ||
| # Welcome to the Reactime contributing guide! | ||
| # Contributing to Reactime :sparkles: | ||
|
|
||
| Thank you for investing your time in contributing to our project! :sparkles:. | ||
| Thank you for your interest in making Reactime even better! :heart_eyes: Your help is invaluable, and we appreciate every contribution, big or small. This guide will walk you through the process of opening issues, creating pull requests, and navigating our workflow. | ||
|
|
||
| In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR. | ||
| ## New Contributor Guide :hatching_chick: | ||
|
|
||
| ## New contributor guide | ||
| Whether you’re brand new to open source or a seasoned pro, we encourage you to: | ||
|
|
||
| To get an overview of the project, read the [README](README.md). Here are some resources to help you get started with open source contributions: | ||
| - **Check out our [README](README.md).** | ||
| It’ll give you a birds-eye view of what Reactime does and how you can get involved. | ||
| - **Explore these helpful resources:** | ||
| - [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github) | ||
| - [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git) | ||
| - [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow) | ||
| - [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests) | ||
|
|
||
| - [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github) | ||
| - [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git) | ||
| - [GitHub flow](https://docs.github.com/en/get-started/quickstart/github-flow) | ||
| - [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests) | ||
| ## Getting Started :rocket: | ||
|
|
||
| ## Getting started | ||
| If you want to understand the codebase in more detail, take a look at our [Developer Guidelines](src/DEVELOPER_README.md). :confetti_ball: | ||
|
|
||
| To navigate our codebase with confidence, see the [Developer Guidelines](src/DEVELOPER_README.md) :confetti_ball:. | ||
| ### Issues :eyes: | ||
|
|
||
| ### Issues | ||
| #### Creating a New Issue :new: | ||
|
|
||
| #### Create a new issue | ||
| 1. **Check existing issues.** | ||
| Before opening a new issue, please [search if it already exists](https://github.com/open-source-labs/reactime/issues). | ||
|
|
||
| If you spot a problem with the docs, [search if an issue already exists](https://github.com/open-source-labs/reactime/issues). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/open-source-labs/reactime/issues/new). | ||
| 2. **Open your own issue.** | ||
| If you can’t find an existing issue, feel free to [open a new one](https://github.com/open-source-labs/reactime/issues/new) to report bugs, request features, or suggest improvements. | ||
|
|
||
| #### Solve an issue | ||
| #### Solving an Issue :wrench: | ||
|
|
||
| Scan through our [existing issues](https://github.com/open-source-labs/reactime/issues) to find one that interests you. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix. | ||
| 1. **Pick an issue.** | ||
| Browse through our [open issues](https://github.com/open-source-labs/reactime/issues). We don’t officially assign them, so if something sparks your interest, go for it! | ||
|
|
||
| ### Make Changes | ||
| 2. **Open a pull request.** | ||
| Once you’re ready to propose a fix or feature, you can open a PR referencing the issue you’re solving. | ||
|
|
||
| #### Make changes in the UI | ||
| ### Make Changes :rainbow: | ||
|
|
||
| Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review. | ||
| #### Small Edits in the UI :pencil2: | ||
|
|
||
| #### Make changes locally | ||
| - Click **Make a contribution** at the bottom of any documentation page to quickly fix typos, broken links, or small wording changes. | ||
| - This will take you directly to the `.md` file, where you can make edits and open a pull request. | ||
|
|
||
| 1. [Install Git LFS](https://docs.github.com/en/github/managing-large-files/versioning-large-files/installing-git-large-file-storage). | ||
| #### Larger Changes Locally :computer: | ||
|
|
||
| 2. Fork the repository. | ||
| 1. **Install Git LFS.** | ||
| Follow the instructions [here](https://docs.github.com/en/github/managing-large-files/versioning-large-files/installing-git-large-file-storage). | ||
|
|
||
| - Using GitHub Desktop: | ||
| 2. **Fork the Repository.** | ||
|
|
||
| - [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop. | ||
| - Once Desktop is set up, you can use it to [fork the repo](https://github.com/open-source-labs/reactime.git)! | ||
| - **GitHub Desktop:** | ||
| [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) walks you through setup. Then, you can [fork the repo](https://github.com/open-source-labs/reactime.git) right from GitHub Desktop! | ||
| - **Command Line:** | ||
| [Fork the repo](https://github.com/open-source-labs/reactime.git) and clone your fork locally so you can work on your own copy. | ||
|
|
||
| - Using the command line: | ||
| - [Fork the repo](https://github.com/open-source-labs/reactime.git) so that you can make your changes without affecting the original project until you're ready to merge them. | ||
| 3. **Create a working branch.** | ||
| Name it something descriptive (e.g., `feature/new-feature` or `fix/typo-in-docs`). | ||
|
|
||
| 3. Create a working branch and start with your changes! | ||
| ### Commit Your Changes :white_check_mark: | ||
|
|
||
| ### Commit your update | ||
| When you’re happy with your updates: | ||
|
|
||
| Commit the changes once you are happy with them. | ||
| 1. **Commit them locally.** | ||
| Write clear commit messages describing _what_ you changed and _why_. | ||
|
|
||
| ### Pull Request | ||
| 2. **Push to your branch.** | ||
| This makes your changes visible on GitHub. | ||
|
|
||
| When you're finished with the changes, create a pull request, also known as a PR. | ||
| ### Open a Pull Request :arrows_counterclockwise: | ||
|
|
||
| - Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request. | ||
| - Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one. | ||
| - Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge. | ||
| Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request additional information. | ||
| - We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch. | ||
| - As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations). | ||
| - If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues. | ||
| Once you’ve finished working and pushed your code: | ||
|
|
||
| ### Your PR is merged! | ||
| 1. **Create the PR.** | ||
| Click on **Compare & pull request** on your branch to open a new PR. | ||
|
|
||
| Congratulations :tada::tada: The Reactime team thanks you! :sparkles:. | ||
| 2. **Fill the "Ready for review" template.** | ||
| This helps reviewers quickly understand the context and purpose of your changes. | ||
|
|
||
| Once your PR is merged, your contributions will be publicly visible on [Reactime](https://github.com/open-source-labs/reactime)! | ||
| 3. **Link Issues.** | ||
| If your PR fixes or relates to an existing issue, [link it](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) in the PR description. | ||
|
|
||
| 4. **Allow Maintainer Edits.** | ||
| Check the box so our team can help update your branch if needed. | ||
|
|
||
| 5. **Address Feedback.** | ||
| If reviewers suggest changes, you can: | ||
|
|
||
| - Apply **suggested changes** directly on the GitHub UI. | ||
| - Make edits in your local branch and push them. | ||
|
|
||
| 6. **Resolve Conversations.** | ||
| Mark each PR comment as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations) once you’ve addressed it. | ||
|
|
||
| 7. **Handle Merge Conflicts.** | ||
| Check out [this tutorial](https://github.com/skills/resolve-merge-conflicts) if you get stuck. | ||
|
|
||
| ## Your PR is Merged! :tada: | ||
|
|
||
| **Congratulations and thank you!** :dancer: :dancer: Once we merge your PR, your contributions become part of Reactime. We appreciate every contribution, and we hope you’ll stick around for more. | ||
|
|
||
| > If you have any further questions or ideas, don’t hesitate to open another issue or join the conversation in the repo! | ||
|
|
||
| --- | ||
|
|
||
| Happy coding and welcome to the Reactime community! :sparkles: |
4 changes: 0 additions & 4 deletions
Dockerfile
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
LICENSE
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
Oops, something went wrong.
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.