Skip to content
Merged

Beta #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f4ab29a
Update README.md to include Issue #774
javiercastrode May 13, 2024
7a4a5a4
Added Greek (el) Translation
Gvolexe Oct 7, 2024
cc9a03a
trakt button background 2024
LeviSnoot Nov 7, 2024
2ba0085
new trakt logo 2024
LeviSnoot Nov 7, 2024
cb74932
Update Font Awesome to 6.7.1
JulianPrieber Dec 5, 2024
5286979
Merge pull request #859 from LinkStackOrg/main
JulianPrieber Dec 5, 2024
29667f7
Fix path
JulianPrieber Dec 5, 2024
e6f42cd
Added Russian
hide-me Dec 7, 2024
b796e9e
Fix theme uploader bug
JulianPrieber Dec 9, 2024
4634300
Update skip route
JulianPrieber Dec 9, 2024
d69558a
Refactor theme extraction logic in UserController
JulianPrieber Dec 9, 2024
d5721ae
Check themes folder when updating
JulianPrieber Dec 9, 2024
e54320e
Migrate Twitter icon to X
JulianPrieber Dec 9, 2024
a184bb8
Merge pull request #777 from javiercastrode/patch-1
JulianPrieber Dec 9, 2024
0bf793b
Merge pull request #861 from hide-me/patch-1
JulianPrieber Dec 9, 2024
6bb8ed5
Move logic to preparing step
JulianPrieber Dec 9, 2024
1f67ef9
Merge branch 'beta' of https://github.com/LinkStackOrg/LinkStack into…
JulianPrieber Dec 9, 2024
6bf1863
Merge pull request #842 from LeviSnoot/new-trakt-logo
JulianPrieber Dec 9, 2024
2302dc1
Revert "Move logic to preparing step"
JulianPrieber Dec 9, 2024
07e2539
Update links.blade.php
omgitsjan Dec 9, 2024
762e5c9
Merge pull request #863 from omgitsjan/main
JulianPrieber Dec 9, 2024
63f1130
Merge pull request #827 from Gvolexe/main
JulianPrieber Dec 9, 2024
dda66d5
Add Xbox Button To LinkStack
Dec 9, 2024
70a5922
Add Threads Icon to Font Awesome List
Dec 9, 2024
07df443
Add threads Button
Dec 9, 2024
16010aa
Merge pull request #864 from MattDevTec/beta
JulianPrieber Dec 10, 2024
ee27f6c
Fix vCard block
JulianPrieber Dec 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ Before updating, the updater will create a backup. Your instance won’t save mo

If you switched your database to MySQL, your database will not be included in the backup.

The updater may fail without throwing an error and just remain on the current version if there are unmet dependencies. This could include not having the correct version of the dependencies (eg. having php-sqlite3 pointing to php8.3-sqlite3, while LinkStack uses PHP 8.2 and needs php8.2-sqlite3). To troubleshoot, update manually and check the errors thown by the instance when accessing the website, as well as the PHP version reported.

<a name="Discord"></a>
## Discord

Expand Down
35 changes: 26 additions & 9 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -753,29 +753,46 @@ public function editTheme(request $request)

if (!empty($zipfile) && Auth::user()->role == 'admin') {

$zipfile->move(base_path('/themes'), "temp.zip");
$themesPath = base_path('themes');
$tmpPath = base_path() . '/themes/temp.zip';
$zipfile->move($themesPath, "temp.zip");

$zip = new ZipArchive;
$zip->open(base_path() . '/themes/temp.zip');
$zip->extractTo(base_path() . '/themes');
$zip->open($tmpPath);
$zip->extractTo($themesPath);
$zip->close();
unlink(base_path() . '/themes/temp.zip');
unlink($tmpPath);

// Removes version numbers from folder.

$folder = base_path('themes');
$regex = '/[0-9.-]/';
$files = scandir($folder);
$files = scandir($themesPath);
$files = array_diff($files, array('.', '..'));

foreach ($files as $file) {

$basename = basename($file);
$filePath = $themesPath . '/' . $basename;

if (!is_dir($filePath)) {

try {
File::delete($filePath);
} catch (exception $e) {}

}

if (preg_match($regex, $basename)) {

$newBasename = preg_replace($regex, '', $basename);
$newPath = $folder . '/' . $newBasename;
File::copyDirectory($file, $newPath);
File::deleteDirectory($file);
$newPath = $themesPath . '/' . $newBasename;
File::copyDirectory($filePath, $newPath);
File::deleteDirectory($filePath);

}

}

}


Expand Down
7,971 changes: 5 additions & 7,966 deletions assets/external-dependencies/fontawesome.css

Large diffs are not rendered by default.

5,982 changes: 3 additions & 5,979 deletions assets/external-dependencies/fontawesome.js

Large diffs are not rendered by default.

40 changes: 34 additions & 6 deletions assets/linkstack/css/brands.css
Original file line number Diff line number Diff line change
Expand Up @@ -1113,12 +1113,21 @@ button.button-scribd{

/* Trakt */
.button.button-trakt {
color: #ffffff;
background-color: #ed1d24;
}
.button.button-trakt:hover,
.button.button-trakt:focus {
filter: brightness(90%);
color: white;
background: radial-gradient(
farthest-corner at 0% 100%,
rgb(245, 6, 19) 0%,
rgb(225, 20, 60) 10%,
rgb(207, 32, 97) 18%,
rgb(192, 43, 129) 27%,
rgb(180, 51, 154) 36%,
rgb(170, 57, 173) 47%,
rgb(164, 62, 187) 58%,
rgb(160, 65, 195) 73%,
rgb(159, 66, 198) 100%
);
background-size: 400% 200%;
background-position: left bottom;
}

/* Trello */
Expand Down Expand Up @@ -1299,3 +1308,22 @@ button.button-scribd{
.button.button-linkstack:focus {
filter: brightness(90%);
}
/* Xbox */
.button.button-xbox {
color: #FFFFFF;
background-color: #0e7a0d
;
}
.button.button-xbox:hover,
.button.button-xbox:focus {
filter: brightness(90%);
}
/* Threads */
.button.button-threads {
color: #FFFFFF;
background-color: #000000;
}
.button.button-threads:hover,
.button.button-threads:focus {
filter: brightness(90%);
}
1 change: 1 addition & 0 deletions assets/linkstack/icons/threads.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 4 additions & 32 deletions assets/linkstack/icons/trakt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/linkstack/icons/xbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified assets/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified assets/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified assets/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified assets/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified assets/webfonts/fa-solid-900.woff2
Binary file not shown.
Binary file modified assets/webfonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file modified assets/webfonts/fa-v4compatibility.woff2
Binary file not shown.
1 change: 0 additions & 1 deletion blocks/vcard/form.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
$middleName = $data->middle_name;
$lastName = $data->last_name;
$suffix = $data->suffix;
$nickname = $data->nickname;
$organization = $data->organization;
$vtitle = $data->vtitle;
$role = $data->role;
Expand Down
2 changes: 1 addition & 1 deletion blocks/vcard/handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function handleLinkType($request, $linkType) {

// Extract the necessary data from the request
$data = $request->only([
'prefix', 'first_name', 'middle_name', 'last_name', 'suffix', 'nickname',
'prefix', 'first_name', 'middle_name', 'last_name', 'suffix',
'organization', 'vtitle', 'role', 'work_url', 'email', 'work_email',
'home_phone', 'work_phone', 'cell_phone', 'home_address_label', 'home_address_street',
'home_address_city', 'home_address_state', 'home_address_zip', 'home_address_country',
Expand Down
15 changes: 15 additions & 0 deletions database/seeders/ButtonSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,21 @@ public function run()
"mb" => false,
],

[
"name" => "xbox",
"alt" => "Xbox",
"exclude" => false,
"group" => "default",
"mb" => false,
],

[
"name" => "threads",
"alt" => "Threads",
"exclude" => false,
"group" => "default",
"mb" => false,
],
];

Button::insert($buttons);
Expand Down
Loading