Even more conflicting calls fixed

[shipsimu.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5763efc167bd685f85c47a94788fc85d1af803e4..e3d7b8cc61fa77ecb0c68e0e76881cf8ffc2442d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -32,6 +32,7 @@ application/ship-simu/exceptions/class_ItemNotInPriceListException.php -text
 application/ship-simu/exceptions/class_ItemNotTradeableException.php -text
 application/ship-simu/exceptions/class_MissingSimulatorIdException.php -text
 application/ship-simu/exceptions/class_MotorShipMismatchException.php -text
+application/ship-simu/exceptions/class_NoShippingCompanyOwnedException.php -text
 application/ship-simu/exceptions/class_NoShipyardsConstructedException.php -text
 application/ship-simu/exceptions/class_PersonellListAlreadyCreatedException.php -text
 application/ship-simu/exceptions/class_RoomShipMismatchException.php -text
@@ -55,8 +56,11 @@ application/ship-simu/interfaces/class_TradeableItem.php -text
 application/ship-simu/loader.php -text
 application/ship-simu/main/.htaccess -text
 application/ship-simu/main/actions/.htaccess -text
-application/ship-simu/main/actions/class_ShipSimuLoginAction.php -text
-application/ship-simu/main/actions/class_ShipSimuProfileAction.php -text
+application/ship-simu/main/actions/ship-simu/.htaccess -text
+application/ship-simu/main/actions/ship-simu/class_ShipSimuLoginAction.php -text
+application/ship-simu/main/actions/ship-simu/class_ShipSimuProfileAction.php -text
+application/ship-simu/main/actions/web/.htaccess -text
+application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php -text
 application/ship-simu/main/class_ -text
 application/ship-simu/main/class_BasePersonell.php -text
 application/ship-simu/main/class_BaseSimulator.php -text
@@ -130,23 +134,30 @@ application/ship-simu/main/structures/extended/decks/class_BaseDeck.php -text
 application/ship-simu/main/structures/extended/lower/.htaccess -text
 application/ship-simu/main/structures/extended/upper/.htaccess -text
 application/ship-simu/main/structures/extended/upper/class_Bridge.php -text
+application/ship-simu/main/wrapper/.htaccess -text
+application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php -text
 application/ship-simu/starter.php -text
 application/ship-simu/templates/.htaccess -text
 application/ship-simu/templates/de/.htaccess -text
+application/ship-simu/templates/de/code/action_login_company.ctp -text
+application/ship-simu/templates/de/code/action_login_logout.ctp -text
+application/ship-simu/templates/de/code/action_login_profile.ctp -text
+application/ship-simu/templates/de/code/action_login_status_problem.ctp -text
+application/ship-simu/templates/de/code/action_login_welcome.ctp -text
+application/ship-simu/templates/de/code/block_company_data.ctp -text
+application/ship-simu/templates/de/code/block_persona_data.ctp -text
 application/ship-simu/templates/de/code/captch_graphic_code.ctp -text
 application/ship-simu/templates/de/code/footer.ctp -text
 application/ship-simu/templates/de/code/header.ctp -text
 application/ship-simu/templates/de/code/home.ctp -text
 application/ship-simu/templates/de/code/login_failed.ctp -text
 application/ship-simu/templates/de/code/login_form.ctp -text
-application/ship-simu/templates/de/code/login_logout.ctp -text
 application/ship-simu/templates/de/code/login_main.ctp -text
-application/ship-simu/templates/de/code/login_profile.ctp -text
-application/ship-simu/templates/de/code/login_status_problem.ctp -text
-application/ship-simu/templates/de/code/login_welcome.ctp -text
 application/ship-simu/templates/de/code/logout_done.ctp -text
 application/ship-simu/templates/de/code/register_form.ctp -text
 application/ship-simu/templates/de/code/shipsimu_main.ctp -text
+application/ship-simu/templates/de/emails/.htaccess -text
+application/ship-simu/templates/de/emails/text_resend_link.tpl -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -text
@@ -193,8 +204,10 @@ inc/classes/exceptions/crypto/.htaccess -text
 inc/classes/exceptions/crypto/class_EncryptInvalidLengthException.php -text
 inc/classes/exceptions/crypto/class_EncryptMissingException.php -text
 inc/classes/exceptions/database/.htaccess -text
+inc/classes/exceptions/database/class_ -text
 inc/classes/exceptions/database/class_DatabaseException.php -text
 inc/classes/exceptions/database/general/.htaccess -text
+inc/classes/exceptions/database/general/class_DatabaseUpdateSupportException.php -text
 inc/classes/exceptions/database/general/class_SqlException.php -text
 inc/classes/exceptions/database/local_file/.htaccess -text
 inc/classes/exceptions/database/local_file/class_SavePathIsEmptyException.php -text
@@ -244,6 +257,7 @@ inc/classes/exceptions/main/class_InvalidArrayCountException.php -text
 inc/classes/exceptions/main/class_InvalidCommandException.php -text
 inc/classes/exceptions/main/class_InvalidCommandInstanceException.php -text
 inc/classes/exceptions/main/class_InvalidControllerException.php -text
+inc/classes/exceptions/main/class_InvalidInterfaceException.php -text
 inc/classes/exceptions/main/class_InvalidObjectException.php -text
 inc/classes/exceptions/main/class_MissingArrayElementsException.php -text
 inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php -text
@@ -303,6 +317,7 @@ inc/classes/interfaces/crypto/.htaccess -text
 inc/classes/interfaces/crypto/class_Cryptable.php -text
 inc/classes/interfaces/database/.htaccess -text
 inc/classes/interfaces/database/class_FrameworkDatabaseInterface.php -text
+inc/classes/interfaces/database/class_Updateable.php -text
 inc/classes/interfaces/database/frontend/.htaccess -text
 inc/classes/interfaces/database/frontend/class_DatabaseFrontendInterface.php -text
 inc/classes/interfaces/database/middleware/.htaccess -text
@@ -434,9 +449,6 @@ inc/classes/main/debug/.htaccess -text
 inc/classes/main/debug/class_DebugConsoleOutput.php -text
 inc/classes/main/debug/class_DebugErrorLogOutput.php -text
 inc/classes/main/debug/class_DebugWebOutput.php -text
-inc/classes/main/extended/.htaccess -text
-inc/classes/main/extended/class_ObjectLimits.php -text
-inc/classes/main/extended/class_SerializationContainer.php -text
 inc/classes/main/factories/.htaccess -text
 inc/classes/main/factories/cache/.htaccess -text
 inc/classes/main/factories/cache/class_CacheFactory.php -text
@@ -496,8 +508,14 @@ inc/classes/main/helper/class_BaseHelper.php -text
 inc/classes/main/helper/login/.htaccess -text
 inc/classes/main/helper/login/class_BaseLoginHelper.php -text
 inc/classes/main/helper/web/.htaccess -text
-inc/classes/main/helper/web/class_WebBlockHelper.php -text
-inc/classes/main/helper/web/class_WebFormHelper.php -text
+inc/classes/main/helper/web/blocks/.htaccess -text
+inc/classes/main/helper/web/blocks/class_WebBlockHelper.php -text
+inc/classes/main/helper/web/class_ -text
+inc/classes/main/helper/web/class_BaseWebHelper.php -text
+inc/classes/main/helper/web/forms/.htaccess -text
+inc/classes/main/helper/web/forms/class_WebFormHelper.php -text
+inc/classes/main/helper/web/links/.htaccess -text
+inc/classes/main/helper/web/links/class_WebLinkHelper.php -text
 inc/classes/main/images/.htaccess -text
 inc/classes/main/images/class_ -text
 inc/classes/main/images/class_BaseImage.php -text