This repository has been archived by the owner on Mar 8, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1409 from modxcms/develop
Develop
- Loading branch information
Showing
588 changed files
with
28,149 additions
and
22,664 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,74 @@ | ||
| # ignore any files beginning with . | ||
| #\.* | ||
| # assets | ||
| /assets/.thumbs/* | ||
| !/assets/.thumbs/index.html | ||
| !/assets/.thumbs/.htaccess | ||
|
|
||
| /assets/backup/* | ||
| !/assets/backup/index.html | ||
| !/assets/backup/.htaccess | ||
|
|
||
| # and any files in the cache directory | ||
| /assets/cache/* | ||
| !/assets/cache/.htaccess | ||
| !/assets/cache/index.html | ||
| !/assets/cache/siteManager.php | ||
| !/assets/cache/sitePublishing.idx.php | ||
| !/assets/cache/images/index.html | ||
| !/assets/cache/rss/index.html | ||
| !/assets/cache/updater/index.html | ||
|
|
||
| /assets/docs/* | ||
| !/assets/docs/.htaccess | ||
| !/assets/docs/changelog.txt | ||
| !/assets/docs/index.html | ||
| !/assets/docs/license.txt | ||
|
|
||
| /assets/export/* | ||
| !/assets/export/index.html | ||
| !/assets/export/.htaccess | ||
|
|
||
| /assets/files/* | ||
| !/assets/files/index.html | ||
| !/assets/files/.htaccess | ||
|
|
||
| /assets/images/* | ||
| !/assets/images/index.html | ||
| !/assets/images/evo-logo.png | ||
| !/assets/images/.htaccess | ||
|
|
||
| # and the config file | ||
| /assets/import/* | ||
| !/assets/import/index.html | ||
| !/assets/import/.htaccess | ||
|
|
||
| /assets/site/* | ||
| !/assets/site/index.html | ||
| !/assets/site/.htaccess | ||
|
|
||
| # Manager | ||
| /manager/includes/config.inc.php | ||
|
|
||
| # Windows and Mac | ||
| # Composer | ||
| /composer.phar | ||
| /vendor/* | ||
| !/vendor/.htaccess | ||
| !/vendor/index.html | ||
|
|
||
| # IDE Helper | ||
| modx_evolution.IDEhelper.php | ||
| _ide_helper.php | ||
| .phpstorm.meta.php | ||
|
|
||
| #node.JS | ||
| /node_modules | ||
| npm-debug.log | ||
|
|
||
| # System | ||
| ftpsync.settings | ||
| Thumbs.db | ||
| Desktop.ini | ||
| .DS_Store | ||
| .idea | ||
| .vagrant | ||
| .rocketeer | ||
|
|
||
| # except do not ignore .gitignore | ||
| !.gitignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| IndexIgnore */* | ||
| <Files *.php> | ||
| Order Deny,Allow | ||
| Deny from all | ||
| </Files> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| IndexIgnore */* | ||
| <Files *.php> | ||
| Order Deny,Allow | ||
| Deny from all | ||
| </Files> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| IndexIgnore */* | ||
| <Files *.php> | ||
| Order Deny,Allow | ||
| Deny from all | ||
| </Files> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| IndexIgnore */* | ||
| <Files *.php> | ||
| Order Deny,Allow | ||
| Deny from all | ||
| </Files> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| IndexIgnore */* | ||
| <Files *.php> | ||
| Order Deny,Allow | ||
| Deny from all | ||
| </Files> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| _euiuLang = []; | ||
| _euiuLang['upload'] = 'Upload'; | ||
| _euiuLang['file'] = 'Datei'; | ||
| _euiuLang['size'] = 'Größe'; | ||
| _euiuLang['progress'] = 'Fortschritt'; | ||
| _euiuLang['files_upload'] = 'Dateien hochladen'; | ||
| _euiuLang['cancel'] = 'Abbrechen'; | ||
| _euiuLang['close'] = 'Schließen'; | ||
| _euiuLang['uploaded'] = 'Hochgeladen'; | ||
| _euiuLang['server_error'] = 'Server-Fehler: '; | ||
| _euiuLang['parse_error'] = 'Fehler bei der Verarbeitung'; | ||
| _euiuUploadResult = []; | ||
| _euiuUploadResult['upload_failed_1'] = 'Datei ist größer als upload_max_filesize'; | ||
| _euiuUploadResult['upload_failed_2'] = 'Datei ist größer als erlaubt'; | ||
| _euiuUploadResult['upload_failed_3'] = 'Die Datei wurde nur teilweise hochgeladen'; | ||
| _euiuUploadResult['upload_failed_4'] = 'Es wurde keine Datei hochgeladen'; | ||
| _euiuUploadResult['upload_failed_6'] = 'Es ist kein temporärer Ordner vorhanden'; | ||
| _euiuUploadResult['upload_failed_7'] = 'Fehler beim Schreiben der Datei auf die Festplatte'; | ||
| _euiuUploadResult['upload_failed_8'] = 'Eine PHP-Erweiterung hat den Datei-Upload gestoppt'; | ||
| _euiuUploadResult['unable_to_process_file'] = 'Fehler bei der Verarbeitung der hochgeladenen Datei'; | ||
| _euiuUploadResult['unable_to_move'] = 'Fehler beim Speichern der Datei'; | ||
| _euiuUploadResult['forbidden_file'] = 'Upload der Datei unzulässig'; | ||
| _euiuUploadResult['unable_to_create_folder'] = 'Fehler beim Erstellen des Upload-Ordners'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| _euiuLang = []; | ||
| _euiuLang['upload'] = 'Uploaden'; | ||
| _euiuLang['file'] = 'Bestand'; | ||
| _euiuLang['size'] = 'Afmeting'; | ||
| _euiuLang['progress'] = 'Voortgang'; | ||
| _euiuLang['files_upload'] = 'Bestanden uploaden'; | ||
| _euiuLang['cancel'] = 'Annuleer'; | ||
| _euiuLang['close'] = 'Sluit'; | ||
| _euiuLang['uploaded'] = 'Geupload'; | ||
| _euiuLang['server_error'] = 'Server error: '; | ||
| _euiuLang['parse_error'] = 'Serverrespons mislukt'; | ||
| _euiuUploadResult = []; | ||
| _euiuUploadResult['upload_failed_1'] = 'Bestandsgrootte is groter dan upload_max_filesize'; | ||
| _euiuUploadResult['upload_failed_2'] = 'Bestandsgrootte is groter dan toegestaan'; | ||
| _euiuUploadResult['upload_failed_3'] = 'Het geuploade bestand is slechts gedeeltelijk geupload'; | ||
| _euiuUploadResult['upload_failed_4'] = 'Er is geen bestand geupload'; | ||
| _euiuUploadResult['upload_failed_6'] = 'Een tijdelijke map ontbreekt'; | ||
| _euiuUploadResult['upload_failed_7'] = 'Bestand uploaden mislukt'; | ||
| _euiuUploadResult['upload_failed_8'] = 'Een PHP-extensie heeft de upload van bestanden gestopt'; | ||
| _euiuUploadResult['unable_to_process_file'] = 'Het bestand uploaden is mislukt'; | ||
| _euiuUploadResult['unable_to_move'] = 'Kan het bestand niet opslaan'; | ||
| _euiuUploadResult['forbidden_file'] = 'Bestand is niet toegestaan om te uploaden'; | ||
| _euiuUploadResult['unable_to_create_folder'] = 'Kan uploadmap niet aanmaken'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| */ | ||
| class HtmlFormatter | ||
| { | ||
|
|
||
| /** | ||
| * @param string $string | ||
| * @param bool $decode | ||
|
|
||
Oops, something went wrong.