Merge origin/master

Conflicts: view/js/script.js
2025-10-03 09:49:28 +02:00 · 2020-01-13 17:58:48 -03:00 · 2020-01-13 17:58:48 -03:00 · 99a76623a3
commit 99a76623a3
parent b655cb3fc6 da9411e231
9279 changed files with 1 additions and 210 deletions
--- a/0
+++ b/0
--- a/admin/customize_settings_native.php
+++ b/admin/customize_settings_native.php
--- a/admin/design_first_page.php
+++ b/admin/design_first_page.php
--- a/admin/design_themes.php
+++ b/admin/design_themes.php
--- a/admin/general_settings_encoder.php
+++ b/admin/general_settings_encoder.php
--- a/admin/img/default.jpg
+++ b/admin/img/default.jpg
--- a/admin/img/gallery.jpg
+++ b/admin/img/gallery.jpg
--- a/admin/img/netflix.jpg
+++ b/admin/img/netflix.jpg
--- a/admin/img/youtube.jpg
+++ b/admin/img/youtube.jpg
--- a/admin/monetize_subscription.php
+++ b/admin/monetize_subscription.php
--- a/admin/payments_settings.php
+++ b/admin/payments_settings.php
--- a/admin/storage_settings.php
+++ b/admin/storage_settings.php
--- a/docker/000-default.conf
+++ b/docker/000-default.conf
--- a/google/autoload.php
+++ b/google/autoload.php
--- a/google/composer/ClassLoader.php
+++ b/google/composer/ClassLoader.php
--- a/google/composer/LICENSE
+++ b/google/composer/LICENSE
--- a/google/composer/autoload_classmap.php
+++ b/google/composer/autoload_classmap.php
--- a/google/composer/autoload_files.php
+++ b/google/composer/autoload_files.php
--- a/google/composer/autoload_namespaces.php
+++ b/google/composer/autoload_namespaces.php
--- a/google/composer/autoload_psr4.php
+++ b/google/composer/autoload_psr4.php
--- a/google/composer/autoload_real.php
+++ b/google/composer/autoload_real.php
--- a/google/composer/autoload_static.php
+++ b/google/composer/autoload_static.php
--- a/google/composer/installed.json
+++ b/google/composer/installed.json
--- a/google/firebase/php-jwt/LICENSE
+++ b/google/firebase/php-jwt/LICENSE
--- a/google/firebase/php-jwt/README.md
+++ b/google/firebase/php-jwt/README.md
--- a/google/firebase/php-jwt/composer.json
+++ b/google/firebase/php-jwt/composer.json
--- a/google/firebase/php-jwt/composer.lock
+++ b/google/firebase/php-jwt/composer.lock
--- a/google/firebase/php-jwt/package.xml
+++ b/google/firebase/php-jwt/package.xml
--- a/google/firebase/php-jwt/src/BeforeValidException.php
+++ b/google/firebase/php-jwt/src/BeforeValidException.php
--- a/google/firebase/php-jwt/src/ExpiredException.php
+++ b/google/firebase/php-jwt/src/ExpiredException.php
--- a/google/firebase/php-jwt/src/JWT.php
+++ b/google/firebase/php-jwt/src/JWT.php
--- a/google/firebase/php-jwt/src/SignatureInvalidException.php
+++ b/google/firebase/php-jwt/src/SignatureInvalidException.php
--- a/google/google/apiclient-services/.gitignore
+++ b/google/google/apiclient-services/.gitignore
--- a/google/google/apiclient-services/.travis.yml
+++ b/google/google/apiclient-services/.travis.yml
--- a/google/google/apiclient-services/CONTRIBUTING.md
+++ b/google/google/apiclient-services/CONTRIBUTING.md
--- a/google/google/apiclient-services/LICENSE
+++ b/google/google/apiclient-services/LICENSE
--- a/google/google/apiclient-services/README.md
+++ b/google/google/apiclient-services/README.md
--- a/google/google/apiclient-services/composer.json
+++ b/google/google/apiclient-services/composer.json
--- a/google/google/apiclient-services/phpunit.xml
+++ b/google/google/apiclient-services/phpunit.xml
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php
--- a/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php
+++ b/google/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php
--- a/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php
+++ b/google/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php
--- a/Show more
+++ b/Show more