? - #1

Open

eiron wants to merge 6204 commits into

eiron:masterfrom

UniversityRadioYork:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 16, 2021

Merge pull request #1039 from UniversityRadioYork/cs-FixLocalInstall
cs-endo
authored
0259e33

Commits on Nov 19, 2021

Merge remote-tracking branch 'origin/master' into markspolakovs-docker
markspolakovs
committed
9dce025
Use sane paths
markspolakovs
committed
63ce2fc
Use sane paths
markspolakovs
committed
e80f82e
Merge branch 'markspolakovs-docker' of github.com:UniversityRadioYork/MyRadio into markspolakovs-docker
markspolakovs
committed
6c82809
Document
markspolakovs
committed
0ea661d
Merge pull request #884 from UniversityRadioYork/markspolakovs-docker
markspolakovs
authored
296b682

Commits on Nov 20, 2021

Add action to rebuild base Docker image
markspolakovs
authored
6bb88cd
Allow manual runs
markspolakovs
authored
8e717e1
Lower-case name
markspolakovs
authored
4a3f39f
Test devcontainer config
markspolakovs
authored
5cddebb
Config tweaks
markspolakovs
authored
45cb4ed
Pending changes exported from your codespace
root
committed
5e3d9b9
Further configuration tweaks
markspolakovs
authored
f7dd0ed
Undo MyRadioException change
markspolakovs
authored
77de495
Document
markspolakovs
authored
277b0ad
Ad a couple forgotten bits of setup
markspolakovs
authored
d6dc8cb
Use mailhog sendmail for email
markspolakovs
authored
e2b1ce9
Fix mailhog config
markspolakovs
authored
adb2f20
Add xdebug configuration for vscode
markspolakovs
authored
89e5fcc
Merge branch 'master' into marks/devcontainer
markspolakovs
authored
afd255b
Document
markspolakovs
authored
9c703b3

Commits on Dec 4, 2021

Commits on Dec 6, 2021

Clarify db hostname for docker install

cs-endo
and
markspolakovs
authored
64cffa6
Explain use of podcast explicit boolean

cs-endo
and
markspolakovs
authored
79fe524
Explain patch 3's query more accurately
cs-endo
authored
465b836

Commits on Feb 23, 2022

Training cut-off + people limit (fixes #1049, fixes #1052) (#1050)

markspolakovs
and
hicks927
authored
764737d

Commits on Mar 20, 2022

Fix semantic playlists by pulling recent tracks from everything apart from Jukebox.
mstratford
authored
55b0ee1

Commits on Jun 19, 2022

Merge branch 'master' into mstratford/welcome
mstratford
authored
b4f87ff
AutoViz control (#1061)
markspolakovs
authored
d7f7016
Fix autoviz clip URL generation
markspolakovs
committed
09aaff8

Commits on Jun 24, 2022

Fix some timeslots sometimes not showing up
markspolakovs
authored
15aebdd

Commits on Aug 14, 2022

Check selector to display currentAndNext off-air vs Jukebox (#1063)
markspolakovs
authored
8977a6c

Commits on Aug 15, 2022

Commits on Aug 30, 2022

JWT Issuing
michael-grace
committed
5582b62

Commits on Sep 19, 2022

Export events calendar to iCal (#999)
markspolakovs
authored
0140a67
Include shows in user iCal feed (#1067)
markspolakovs
authored
c60f9db
Merge branch 'master' into mstratford/welcome
markspolakovs
authored
9e3356f

Commits on Sep 24, 2022

Event duplication (#1065)
markspolakovs
authored
c3efc4d

Commits on Sep 26, 2022

Fix failure to signup when a signup cutoff is set (#1074)
markspolakovs
authored
40c712d

Commits on Sep 27, 2022

Fix PHP notice on createDemo page (#1075)
markspolakovs
authored
2e9b12b

Commits on Sep 28, 2022

Create stacks.yml
markspolakovs
authored
1bb0305
Rework inputs
markspolakovs
authored
6ff1dca
FIx secrets
markspolakovs
committed
efa628e

Commits on Oct 3, 2022

Remove notice about clearing cache from podcast form
markspolakovs
authored
33feb2b

Commits on Oct 4, 2022

Update signup cutoff and max participants when editing demo (#1078)
markspolakovs
authored
d8b0291

Commits on Oct 5, 2022

Show day of week in demo times (#1083)
markspolakovs
authored
dee8429

Commits on Oct 8, 2022

Allow archiving a training status (#1084)
markspolakovs
authored
21e5780
Whoops
markspolakovs
authored
79609a7
Make Studio Trained the requirement to apply for shows
markspolakovs
authored
9a5cf09

Commits on Oct 9, 2022

Commits on Oct 10, 2022

Cancel demos (#1087)
markspolakovs
authored
9cf16a7
php is annoying
markspolakovs
committed
8f1f789

Commits on Oct 11, 2022

remove mark user trained button (#1089)
michael-grace
authored
3a35281

Commits on Oct 14, 2022

Clean up demo_attendee records for missed demos (#1081)
markspolakovs
authored
afcdb8c

Commits on Oct 17, 2022

Pink
michael-grace
committed
68078e9
Merge pull request #1032 from UniversityRadioYork/mstratford/welcome
mstratford
authored
0106699

Commits on Jan 6, 2023

Warning for allocating season where user hasn't signed contract (#1059)

michael-grace
and
markspolakovs
authored
8db99a7

Commits on Jan 23, 2023

Fix double space in "Attending Training" email (#1106)
markspolakovs
authored
7334587

Commits on Apr 10, 2023

Wrap setShowPhoto in a transaction
markspolakovs
committed
d324236

Commits on Apr 11, 2023

Merge pull request #1112 from UniversityRadioYork/marks/GH-1111
JamboPE
authored
132941d

Commits on Jul 7, 2023

Update menu.json
JamboPE
authored
c837592
Update menu.json
JamboPE
authored
34682d3
Merge pull request #1120 from UniversityRadioYork/JamboPE-removing-track-and-trace-link
JamboPE
authored
7cbb233

Commits on Jul 17, 2023

just everything on prod
Charlie Root
committed
079eef4

Commits on Jul 18, 2023

tidy prod
Charlie Root
committed
039f576
all the stuff living on prod
michael-grace
authored
e5931d9

Commits on Aug 6, 2023

fix userSelectedTimeslot

michael-grace
authored and
Charlie Root
committed
acefa58
fix userSelectedTimeslot (#1125)
michael-grace
authored
655ad8b

Commits on Aug 14, 2023

Semesterisation

JP5457
authored and
michael-grace
committed
9b27153
Custom Week Names
michael-grace
committed
8aed92f
MyRadio_Term Class
michael-grace
committed
652b22f
Merge branch 'master' into jp-semester-2
michael-grace
authored
df6108a

Commits on Sep 6, 2023

shut up, it could have worked
Charlie Root
committed
1a1ea52

Commits on Sep 21, 2023

Update text on training slots page
ColinRoitt
authored
c59b89f
Merge pull request #1127 from UniversityRadioYork/colin-edit-semantics
ColinRoitt
authored
3c0561c
few fixes for semesters
Charlie Root
committed
9281d36
Update text on training slots page

ColinRoitt
authored and
Charlie Root
committed
21b70b1

Commits on Sep 27, 2023

Semesterisation
JamboPE
authored
57882c0
song requests link (#1129)
JamboPE
authored
620534a

Commits on Oct 6, 2023

prod patches
root
committed
00739ec
Merge pull request #1131 from UniversityRadioYork/patches-23-10-06
JP5457
authored
660d48b
show art button
JP5457
committed
a1c8628
Merge pull request #1132 from UniversityRadioYork/jp-editshowart
JP5457
authored
e2762df

Commits on Oct 9, 2023

Commits on Oct 17, 2023

test
Big Jimmy
committed
a3ad63a
test
Big Jimmy
committed
372da96

Commits on Oct 25, 2023

Temp fix to password reset email in MyRadioDefaultAuthenticator.php (#1136)

JamboPE
and
markspolakovs
authored
409d271

Commits on Oct 26, 2023

michael
Charlie Root
committed
2bf1d39
Temp fix to password reset email in MyRadioDefaultAuthenticator.php (#1136)

authored and
Charlie Root
committed
bc7e739

Commits on Oct 31, 2023

test

Big Jimmy
authored and
Big Jimmy
committed
9d88f4a
Merge pull request #1134 from UniversityRadioYork/data-protection-is-probably-a-good-idea-yes
JP5457
authored
c988fa9

Commits on Nov 1, 2023

Merge branch 'master' of myradio.github:UniversityRadioYork/myradio
Charlie Root
committed
2ca6346
Merge branch 'master' into mg-stuffs
Charlie Root
committed
cfc6ff4
add demoer id
Charlie Root
committed
d6a47a2
int memberid
Charlie Root
committed
9274972

Commits on Nov 15, 2023

Update MyRadio_Scheduler.php
hitime1234
authored
9ed6f7c
Get number of weeks from Myradio_term
hitime1234
committed
4c38fbb
woopise actually does php and remove dups
hitime1234
committed
c527e69
removes comment
hitime1234
committed
dae0209

Commits on Nov 22, 2023

Merge pull request #1138 from hitime1234/master
JP5457
authored
1976b7b

Commits on Jan 8, 2024

F in chat for the spreadsheeeeet
michael-grace
authored
5cd1c2e

Commits on Jan 11, 2024

Commits on Jan 16, 2024

jwt change
michael-grace
committed
d9eefc4
exception for redirect to
michael-grace
committed
eb5eaab
remove lines;
michael-grace
committed
5f29ba7

Commits on Feb 2, 2024

docker 1
Michael Grace
committed
84a0a61
Merge remote-tracking branch 'origin/mg-booking-app-stuff' into mg-stuffs
Michael Grace
committed
02d4bad

Commits on Feb 7, 2024

Set permissions for image uploads (#1144)
markspolakovs
authored
af9927b
Set permissions for image uploads (#1144)

markspolakovs
authored and
Michael Grace
committed
88a1583
remove track n trace reference (#1145)
alyxbb
authored
a50fd2f

Commits on Feb 8, 2024

email fixes
Michael Grace
committed
5c1f028

Commits on Feb 17, 2024

prod dockerfile
Michael Grace
committed
0ab0f50
remove moved ssession sstart
Michael Grace
committed
95586b3

Commits on Feb 21, 2024

Upgrade development Dockerfile to PHP 8 + setup fixes (#1142)
markspolakovs
authored
b759efc

Commits on Mar 6, 2024

conflicts
michael-grace
committed
2e7429c
Dockerfile updates
michael-grace
committed
00a8a27

Commits on Mar 20, 2024

Merge pull request #1146 from UniversityRadioYork/mg-stuffs
ashhhleyyy
authored
bf7c446

Commits on May 10, 2024

Update menu.json
hitime1234
authored
d458891
Update menu.json
hitime1234
authored
1dabc43
Merge pull request #1147 from hitime1234/master
hitime1234
authored
d0ed56e

Commits on May 21, 2024

fix the breaking issue in php8 and some of the warnings (#1150)
michael-grace
authored
0079295
London Bridge has fallen (#1148)
alyxbb
authored
581c08f

Commits on May 29, 2024

Terms API
michael-grace
authored
23116a4
Revert "Terms API"
michael-grace
committed
2a756b8

Commits on Aug 22, 2024

Nickname Upgrade
hitime1234
committed
dbd57d8
fixes news column
hitime1234
committed
f241e70
fixes email leak
hitime1234
committed
d7e19f6
changes wording on emails to state that emails are public
hitime1234
committed
47667ec

Commits on Aug 23, 2024

adds nickname to user Profile inside internal myradio
hitime1234
committed
46eb851
fixes show search name becoming concat
hitime1234
committed
94c566e
migration test
hitime1234
committed
55c582f
needs actually tell it to update
hitime1234
committed
402197b
migration test pt2?
hitime1234
committed
6cbd87f
migration test pt3?
hitime1234
committed
1f70d5f
migration test pt4?
hitime1234
committed
b3f6e09
?????????
hitime1234
committed
2260f10
?????????????
hitime1234
committed
1595045
maybe?
hitime1234
committed
568c8a4

Commits on Aug 24, 2024

Finale (Ready for merge)
hitime1234
committed
00b7f79

Commits on Aug 25, 2024

updated the install docs to includes steps about setting up your own miniury
hitime1234
committed
0e67df4
formatting
hitime1234
committed
031ce88
smaller format
hitime1234
committed
b3d88cf
better wording
hitime1234
committed
529480d
spacing
hitime1234
committed
84a0688
remove unneed words
hitime1234
committed
65dea72
adding headers
hitime1234
committed
75219aa
ADDS fixes for missing metadata key
hitime1234
committed
cf3dfca
removes wording regarding metadata key missing issue
hitime1234
committed
91d2cd7

Commits on Aug 26, 2024

added some details to docker install instructions

Big Jimmy
authored and
Big Jimmy
committed
098597c
added some details to docker install instructions

Big Jimmy
authored and
Big Jimmy
committed
40bd095
Merge pull request #1154 from UniversityRadioYork/rens-updates
hitime1234
authored
e2a7cc8
didn't catch these break search. I will remove them for now
hitime1234
committed
f7979ec
Fix Warnings and Errors for Deprecated Things in PHP8 (#1151)
michael-grace
authored
a124897
Merge pull request #1157 from UniversityRadioYork/rens-updates
hitime1234
authored
c1eb331
fixes search list containing nicknames
hitime1234
committed
62e0d53
Merge pull request #1158 from UniversityRadioYork/master
hitime1234
authored
1109814
remove unneeded words
hitime1234
committed
4bae430
Merge pull request #1159 from UniversityRadioYork/rens-updates
hitime1234
authored
d4a2ee8
Remove Stacks workflow (#1155)
markspolakovs
authored
d4a7d22

Commits on Aug 28, 2024

Few fixes to fix loading showplans
michael-grace
authored
c2eaf97

Commits on Sep 5, 2024

Commits on Sep 11, 2024

Fix graphql api (#1165)
ashhhleyyy
authored
f356653
Fix "ClientAware is not compatible" exception on graphql (#1167)
markspolakovs
authored
d85b0ae

Commits on Sep 15, 2024

fix: do not require nickname on signup
ashhhleyyy
committed
ba3639d
fix: fix user signup for reals this time (#1170)
ashhhleyyy
authored
f8e9cf7
Actions: Build ARM64 dev base image (#1169)
markspolakovs
authored
f280efc

Commits on Sep 16, 2024

Commits on Sep 17, 2024

terms api (#1161)
michael-grace
authored
7aad30a
fix: encode emails correctly (#1178)
ashhhleyyy
authored
a0d4c81
Remove adv. studio training option temp
ColinRoitt
authored
37e9f07

Commits on Sep 18, 2024

Merge pull request #1179 from UniversityRadioYork/colin-update-training-forms
ColinRoitt
authored
1109887

Commits on Oct 2, 2024

Split the I want to section
AlexNimzy
committed
35984ca
Moved the things into different columns
AlexNimzy
committed
30ed800

Commits on Oct 3, 2024

Commits on Oct 17, 2024

Show booking availability in training form (#1194)
ColinRoitt
authored
c6b1c90
Ignore .DS_Store in .gitignore (#1193)
ColinRoitt
authored
225dd38

Commits on Nov 6, 2024

Add clipper to Show Tools list under logger
ColinRoitt
authored
65451df

Commits on Nov 19, 2024

Commits on Dec 2, 2024

Merge pull request #1195 from UniversityRadioYork/colin/clipper-link
ColinRoitt
authored
64938cd

Commits on Dec 4, 2024

Link to new presenters' contract in google drive
ColinRoitt
authored
7f2d07a

Commits on Dec 6, 2024

Merge pull request #1202 from UniversityRadioYork/colin/update-presenters-contract
ColinRoitt
authored
1bde253

Commits on Dec 15, 2024

improve search (#1201)
alyxbb
authored
ad5dc23

Commits on Mar 10, 2025

Update dev-base-image.yml (#1203)
hitime1234
authored
c35f77e

Commits on Mar 23, 2025

fix: several warnings from php8 migration (#1204)
ashhhleyyy
authored
9310818

Commits on Apr 2, 2025

Change podcast RSS feed email (#1207)
ColinRoitt
authored
2ce4687
include @ in email string (#1208)
ColinRoitt
authored
b3a1542

Commits on Apr 16, 2025

Add patch for cancel timeslot coming through API
ColinRoitt
committed
3324cc5

Commits on Apr 17, 2025

Commits on Apr 21, 2025

add a fix if calling schedule endpoint through API
ColinRoitt
committed
de192f6

Commits on Apr 22, 2025

Merge pull request #1210 from UniversityRadioYork/colin/allocate-api-fix
ColinRoitt
authored
f2d5050

Commits on Apr 23, 2025

actually fix api call
ColinRoitt
committed
89b8ff7
Merge pull request #1211 from UniversityRadioYork/colin/actually-fix-api
ColinRoitt
authored
da89b2d

Commits on May 6, 2025

add link to baraddur
ColinRoitt
committed
51479f1
Merge pull request #1214 from UniversityRadioYork/colin/baraddur
ColinRoitt
authored
05c779e

Commits on May 12, 2025

Add move link to scheduler
ColinRoitt
committed
18693aa
introduce an add episode button to seasons
ColinRoitt
committed
b9c37b9
add placeholder user ID for API calls in addEpisode method
ColinRoitt
committed
0f8184e

Commits on May 15, 2025

send email on move timeslot function
ColinRoitt
committed
2f67f4a
put back mixcloud data
ColinRoitt
committed
5ddaff5

Commits on May 16, 2025

fix display of tables with new buttons
ColinRoitt
committed
3307831
get times for moved timeslot email
ColinRoitt
committed
29291cd

Commits on May 18, 2025

handle API call on addItem
ColinRoitt
committed
078a6c3

Commits on May 21, 2025

fix incorrect logic
ColinRoitt
committed
5ced0d0
get memberid from API call
ColinRoitt
committed
8d26a85
add rest of the function...
ColinRoitt
committed
17d1e97
add default arg
ColinRoitt
committed
aba0a3e

Commits on May 28, 2025

allow memberid to be sent via request
ColinRoitt
committed
a761188

Commits on Jun 2, 2025

remove debug placeholders
ColinRoitt
committed
170de63
add mixcloud data back
ColinRoitt
committed
aeba48a
Merge pull request #1215 from UniversityRadioYork/colin-scheduler-changes-dev
ColinRoitt
authored
c3f4a34

Commits on Jun 3, 2025

Update move episode email subject line (#1216)
ColinRoitt
authored
11dbca9

Commits on Jun 22, 2025

fix: use X-Real-IP header for remote IP (#1221)
ashhhleyyy
authored
767eae2
fix: fix: lol (#1222)
ashhhleyyy
authored
5e77811

Commits on Sep 20, 2025

Ash/new signups (#1224)
ashhhleyyy
authored
24a3e59

Commits on Sep 22, 2025

chore: update keycard access form (#1225)
ashhhleyyy
authored
7ad2314
fix: attending demos though UI (#1226)
ashhhleyyy
authored
f125bb8

Commits on Oct 2, 2025

Add show art link to MyRadio (#1227)
AlexNimzy
authored
908297e

Commits on Oct 20, 2025

fix: update webcam streaming for new system
ashhhleyyy
committed
f239138
chore: remove request show marketing form from main menu
ashhhleyyy
committed
52ed79e

Commits on Jan 21, 2026

fix: hopefully make officership creation work again
ashhhleyyy
committed
4f0d947

Commits on Jan 22, 2026

Merge pull request #1231 from UniversityRadioYork/ash/fix-officer-creation
lxiagkb
authored
368f5c5

Commits on Feb 8, 2026

fix(docker): add --no-security-blocking
ashhhleyyy
committed
07c2952