Skip to content

Iter4 end 2025 04 21 #31

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
Open
wants to merge 288 commits into
base: main
Choose a base branch
from
Open

Iter4 end 2025 04 21 #31

wants to merge 288 commits into from

Conversation

@WinbrosXP
Copy link

@WinbrosXP WinbrosXP commented Apr 24, 2025

Most Recent PRs:

  • Mock login for Internal Handoff testing
  • Include secrets/keys in credentials.yml
  • Update read.me and app stand-up walkthrough
    Other Changes:
  • Expanded Admin Features
  • CRUD for Events, Scholarships, Courses
  • Permission change controls

MaxYang24 and others added 30 commits April 20, 2023 12:56
@MaxYang24
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
2baebbc 
…ent-program
@MaxYang24
first commit
bf28b79
@EthanqX
always expanded nav bar
a866e29
@MaxYang24
Merge pull request #7 from cs169/185001925-navbar_scholarships_page
e022283 
185001925 navbar scholarships page
@MaxYang24
added courses page
3074f93
@MaxYang24
added rspec
6fdbd30
@MaxYang24
added cucumber test
27bb973
@MaxYang24
cl fix try_1
c141d58
@MaxYang24
try1 rspec for courses_controller
828796c
@MaxYang24
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
0914775 
…ent-program
@EthanqX
Merge pull request #10 from cs169/add_courses
4296939 
Added courses; changed logo and main color theme
@MaxYang24
added nav bars
6d7f9a5
@MaxYang24
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
07bf064 
…ent-program
@MaxYang24
changed colors of navbars and text
be7837f
@MaxYang24
Merge branch 'main' into add_navbars
d5f5dbd
@EthanqX
Merge pull request #11 from cs169/add_navbars
78a2924 
Add navbars
@MaxYang24
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
702da5a 
…ent-program
@MaxYang24
try_fix
dc1dc5a
@MaxYang24
added rspec
8a3b30b
@smanchkanti
Merge pull request #13 from cs169/fix_appointment_bug
652a19f 
Fix appointment bug and added rspec for codecov
@MaxYang24
ignore .DS_Store
7e61efb
Podcast page added
4fcdee5
Test for podcast page
a08a454
Resolved conflict with DS_Store
0104e64
Added rspec file for podcast
55c57e6
Fixed rspec issue
0f8d70e
@gekerd
Merge pull request #15 from cs169/185015924_add_podcast
361ca7e 
add podcast page
@MaxYang24
changed README.md
846db10
@EthanqX
Merge pull request #17 from cs169/change_readme
23c2110 
changed README.md
@gekerd
Update pages view
46a6d57
mandywong0 and others added 29 commits April 21, 2025 12:58
@mandywong0
delete line in feature file events admin for now
d541706
@WinbrosXP
WOrking on mock login
dbb1645
@WinbrosXP
WOrking on mock login
6a75c84
@WinbrosXP
WOrking on mock login
e14332b
@WinbrosXP
WOrking on mock login
a43741c
@WinbrosXP
WOrking on mock login
e7d3dc8
@WinbrosXP
WOrking on mock login
755ac26
@WinbrosXP
WOrking on mock login
79a50df
@WinbrosXP
WOrking on mock login
97e6e20
@WinbrosXP
WOrking on mock login
0a750f9
@WinbrosXP
WOrking on mock login
df9815e
@WinbrosXP
WOrking on mock login
5ef2f80
@WinbrosXP
Merge pull request #94 from cs169/event_admin
881e71c 
For Event Management Page: added delete functionality and export functionality
@WinbrosXP
Rubocop fixes
cbe4d29
@mandywong0
Merge pull request #96 from cs169/fake-login
22dca08 
Mock Login for Internal Handoff
@KefengDuan1
Standalize Scholarships tables and Add Export Button.
7fa5dab
@KefengDuan1
RuboCop fix.
f847a43
@WinbrosXP
Stored keys/secrets in credentials.yml
2e0e4aa
@sherher21
Merge pull request #99 from cs169/branch-to-golden-repo
92f3418 
Branch to golden repo
@sherher21
Merge pull request #102 from cs169/100-secrets-keys
04f4fff 
Stored keys/secrets in credentials.yml
@sherher21
Updated Project Status and Heroku deployment
083338d
@sherher21
Added user role admin feature
78c20e3
@WinbrosXP
Merge pull request #104 from cs169/103-add-user-admin-feature
bb9ad56 
Added user role admin feature
@sherher21
Added new relic and canvas blurb
dff54a0
@sherher21
Updated credentials and calls to ENV
bbd3219
@sherher21
Updated Canvas README
808815a
@WinbrosXP
Merge pull request #105 from cs169/51-add-info-to-readme-about-new-re…
d7ae1bb 
…lic-apm-canvas-login-etc

51 add info to readme about new relic apm canvas login etc
@WinbrosXP
Merge pull request #106 from cs169/main
b334377 
For Golden Repo
@WinbrosXP
Fixing keys for google
300f7b3
@sherher21
Copy link

sherher21 commented Apr 24, 2025 •
edited
Loading

@cycomachead @armandofox

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

Reviewers

No reviews

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

@WinbrosXP @sherher21 @MaxYang24 @EthanqX @smanchkanti @gekerd @cycomachead @mandywong0 @KefengDuan1 @henwanfan