KillerDogeEmpire
/
AquaStream
mirror of https://github.com/KillerDogeEmpire/AquaStream.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,109 Commits 2 Branches 1 Tag 28 MiB
Commit Graph

138 Commits

Author SHA1 Message Date
Sir Aguacata b171ad16b7
Merge branch 'recloudstream:master' into master 2023-03-19 11:32:53 -07:00
Cloudburst 0cbee70683
[skip ci] Update locales.py 2023-03-19 12:51:54 +01:00
Sir Aguacata f58208087a
Merge branch 'recloudstream:master' into master 2023-03-18 13:01:17 -07:00
Cloudburst 5245eff6e1
[skip ci] fix xml header being slightly wrong 2023-03-18 09:22:07 +01:00
KillerDogeEmpire 3251d6e328 FUCKING CONFLICTS 2023-03-14 15:05:12 -07:00
Cloudburst 7bfcf25df4 add a way to autofix weblate's issue with @string 2023-03-14 18:50:13 +00:00
KillerDogeEmpire 1e3c21c6ca
Merge branch 'recloudstream:master' into master 2023-02-07 10:55:34 -08:00
Cloudburst a148f347cd
[skip ci] issue action.yml 2023-02-07 11:15:00 +01:00
Cloudburst f939e4cff2 update langs to use native names fix #339 2023-02-07 10:04:27 +00:00
KillerDogeEmpire 6e52532188
Merge branch 'recloudstream:master' into master 2023-01-31 10:12:31 -08:00
Cloudburst 490381451b
[skip ci] label issues if provider mentioned 2023-01-31 10:57:11 +01:00
KillerDogeEmpire e76d042d9f Fix Build APk not showing up (possibly) 2023-01-29 14:04:32 -08:00
KillerDogeEmpire 14d153d485 Deleted build to archive 2023-01-29 13:32:47 -08:00
KillerDogeEmpire aeeab79f1f If this dosen't work for build archive I'm just getting rid of it 2023-01-29 13:23:25 -08:00
KillerDogeEmpire a9376dd142 fix 2023-01-28 21:17:19 -08:00
Cloudburst 60c1eb2579
Update update_locales.yml 2023-01-15 12:04:57 +01:00
Cloudburst 61ab957e35
make the update_locales not use github actions token 
gh actions token supposedly makes it so the next action doesnt trigger on push
 2023-01-06 22:27:23 +01:00
Cloudburst 0afb6b62aa
Update update_locales.yml 2023-01-02 12:44:23 +01:00
Cloudburst 6db688e0bf
only run on master 2022-12-25 19:52:30 +01:00
Cloudburst 9c956f68f9
make CI add langs from weblate 2022-12-25 19:49:59 +01:00
KillerDogeEmpire 27901c29bf Fixed my app 2022-12-19 22:18:30 -08:00
KillerDogeEmpire e4cc642c81 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
#	app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/styles.xml
#	app/src/main/res/xml/settings_providers.xml
 2022-12-19 22:09:59 -08:00
Cloudburst 0e8aacf989
[skip ci] add builds archive 2022-10-31 14:23:11 +01:00
KillerDogeEmpire 62d08653de Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	app/build.gradle
 2022-10-27 19:49:27 -07:00
Cloudburst 7e750a40e0
fix da build (again) 2022-10-26 23:09:28 +02:00
Cloudburst fa6a620bf9 fix builds 2022-10-26 22:39:36 +02:00
Cloudburst 49ebd27f80
fix broken strings.xml and migrate to $GITHUB_OUTPUT 2022-10-26 22:06:19 +02:00
J. Fronny 0f625142da
Switch to kotlin build scripts (#158) 2022-10-26 21:56:31 +02:00
Cloudburst 4c309bbb2a
[skip ci] increase issue analysis threshold 2022-10-25 10:41:12 +02:00
KillerDogeEmpire 2b84e52f88
Merge branch 'recloudstream:master' into master 2022-10-08 10:39:15 -07:00
Cloudburst 4538909d9a
[skip_ci] update issue config 2022-10-08 19:26:41 +02:00
KillerDogeEmpire 65495c97a2
Merge branch 'recloudstream:master' into master 2022-10-06 11:49:20 -07:00
Cloudburst 9ab43d06fc
Update issue_action.yml 2022-10-06 12:09:28 +02:00
KillerDogeEmpire c49c34ee92 Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master 
# Conflicts:
#	app/src/main/ic_launcher-playstore.png
#	app/src/main/res/mipmap-hdpi/ic_launcher.png
#	app/src/main/res/mipmap-hdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-mdpi/ic_launcher.png
#	app/src/main/res/mipmap-mdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
#	app/src/prerelease/ic_launcher-playstore.png
#	app/src/prerelease/res/mipmap-hdpi/ic_launcher.png
#	app/src/prerelease/res/mipmap-hdpi/ic_launcher_round.png
#	app/src/prerelease/res/mipmap-mdpi/ic_launcher.png
#	app/src/prerelease/res/mipmap-mdpi/ic_launcher_round.png
#	app/src/prerelease/res/mipmap-xhdpi/ic_launcher.png
#	app/src/prerelease/res/mipmap-xhdpi/ic_launcher_round.png
#	app/src/prerelease/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/prerelease/res/mipmap-xxhdpi/ic_launcher_round.png
#	app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher.png
#	app/src/prerelease/res/mipmap-xxxhdpi/ic_launcher_round.png
 2022-09-22 15:18:58 -07:00
imgbot[bot] da09310595
[skip actions] [ImgBot] Optimize images (#116) 
Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com>
 2022-09-22 19:24:00 +02:00
KillerDogeEmpire ce0f786d6b Merge branch 'master' of https://github.com/recloudstream/cloudstream into recloudstream-master 
# Conflicts:
#	.github/workflows/generate_dokka.yml
 2022-09-20 15:27:47 -07:00
Cloudburst d057a73368
fix dokka? 2022-09-20 22:01:30 +02:00
Cloudburst 9bbe3d65d2 link dokka to github and make builds concurrent 2022-09-18 14:06:48 +02:00
KillerDogeEmpire 06dd090756 Remove Dokka 2022-09-08 15:53:52 -07:00
KillerDogeEmpire 449f2007df Remove Dokka 2022-09-08 15:52:27 -07:00
KillerDogeEmpire 03f400f108 Made auto build actually work 2022-09-08 15:48:05 -07:00
KillerDogeEmpire 3fee4adc00 Made auto build actually work 2022-09-07 18:43:40 -07:00
KillerDogeEmpire ad1cd387c5 Merge branch 'master' of https://github.com/recloudstream/cloudstream 
# Conflicts:
#	.github/workflows/prerelease.yml
 2022-09-07 16:08:49 -07:00
Cloudburst 73748ee55f
[skip ci] make prerelease a prerelease 2022-09-07 08:33:04 +02:00
KillerDogeEmpire 13511751b8 Bug fixes, fix auto build, new beta logo 2022-09-06 17:06:48 -07:00
KillerDogeEmpire 413bdb39d3 Bug Fixes and New Logo 2022-09-06 16:11:11 -07:00
Cloudburst 18d257eb2a
[skip ci] another small fix 2022-08-20 15:41:29 +02:00
Cloudburst 07859c529d
[skip ci] small fix to the issue closer 2022-08-20 15:37:27 +02:00
Cloudburst f86d9881ae
[skip ci] fix issue-actions 2022-08-20 13:32:02 +02:00
Cloudburst 4583da59da
[skip ci] fix issue-actions 2022-08-20 13:23:16 +02:00