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

185002075 Added courses page #24

Open
wants to merge 71 commits into
base: main
Choose a base branch
from
Open

185002075 Added courses page #24

wants to merge 71 commits into from

Conversation

MaxYang24
Copy link

@MaxYang24 MaxYang24 commented Apr 21, 2023 •
edited
Loading

Added the courses page to show course information. It is a static page. Needs to be updates mannually.

gekerd and others added 30 commits February 17, 2023 18:36
@gekerd
Test yml
7a0259a
@gekerd
Delete man.yml
f2f61f8
@gekerd
Update README.md
102ab19
@gekerd
Update README.md
a32aff4
@gekerd
Update info.yml
c7e8ed8
@gekerd
Merge pull request #1 from cs169/gekerd-patch-1
3873c65 
Gekerd patch 1
@gekerd
Update info.yml
5d21074
@EthanqX
finished dry run
057ca34
@gekerd
Update README.md
7f98feb
@gekerd
Update Bluejay URL
016d830
@EthanqX
Merge branch 'main' of github.com:cs169/berkeley-reentry-student-program
76ab4b1
@MaxYang24
added scholarship button
fb40603
@EthanqX
added scholarships link
0516187
@EthanqX
has_key? to key?
7a93185
@MaxYang24
Merge pull request #2 from cs169/184589769-ScholarshipLink
2af5d8c 
Scholarships link on home page
@MaxYang24
merge backup
5c96ebe
@MaxYang24
merge stuff
3d4703a
@MaxYang24
tried somed rspec for scholarship
701b2d5
@MaxYang24
incomplete rspec for scholarship
20e2006
@MaxYang24
incomplete rspec for scholar
442f6a4
@MaxYang24
incomplete rspec for scholar
337f237
@MaxYang24
finished rspec
a3a6138
@EthanqX
Merge pull request #3 from cs169/add_rspec_scholarship
8ec9eb6 
Add rspec scholarship
Footer additions
746f4fc
Footer and rebase
a4f122d
Rebase
e85c6e0
Footer additions
9bfe607
Footer added to home
2a57a1e
@MaxYang24
solve merge conflict
9f9711c
@cycomachead
Create pull_request_template.md
894e288 
Adds a file to scaffold creating new PRs
@MaxYang24 MaxYang24 marked this pull request as draft April 21, 2023 21:40
@MaxYang24 MaxYang24 marked this pull request as ready for review April 21, 2023 21:41
@MaxYang24 MaxYang24 changed the title Added courses page 185002075 Added courses page Apr 22, 2023
@MaxYang24 MaxYang24 marked this pull request as draft April 25, 2023 23:48
@MaxYang24 MaxYang24 marked this pull request as ready for review April 25, 2023 23:49
@simonjov
Copy link

simonjov commented Apr 26, 2023 •
edited
Loading

_ No description provided. _

Please add a description for this PR for future developers to have a better idea of what specifically the high-level purpose and methods of this PR were.

simonjov
simonjov requested changes Apr 26, 2023
View reviewed changes
Copy link

@simonjov simonjov left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Again, just remove the .DS_Store files and add a description and this PR should be ready to merge!

MaxYang24 and others added 3 commits April 26, 2023 12:43
@MaxYang24 MaxYang24 marked this pull request as draft April 26, 2023 23:14
@MaxYang24 MaxYang24 marked this pull request as ready for review April 27, 2023 06:42
@MaxYang24
Copy link
Author

I've put DS.store in my gitignore file, but it still shows up. How do I delete them?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonjov simonjov simonjov requested changes

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

Successfully merging this pull request may close these issues.
6 participants
@MaxYang24 @simonjov @gekerd @EthanqX @cycomachead @smanchkanti