Double class removed

[shipsimu.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 2084758942c71ba1673686d533a13e1ac997616c..2f16f71fa3c7eb3006d2106871a970b080e82451 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -102,7 +102,11 @@ 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_WebLogin -text
 application/ship-simu/main/actions/web/class_WebLoginCompanyAction.php -text
+application/ship-simu/main/actions/web/class_WebLoginMoneyRefillAction.php -text
+application/ship-simu/main/bank/.htaccess -text
+application/ship-simu/main/bank/class_MoneyBank.php -text
 application/ship-simu/main/class_ -text
 application/ship-simu/main/class_BasePersonell.php -text
 application/ship-simu/main/class_BaseSimulator.php -text
@@ -110,6 +114,7 @@ application/ship-simu/main/class_Merchant.php -text
 application/ship-simu/main/class_WorksContract.php -text
 application/ship-simu/main/commands/.htaccess -text
 application/ship-simu/main/commands/web/.htaccess -text
+application/ship-simu/main/commands/web/class_WebMoneyRefillFormCommand.php -text
 application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php -text
 application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php -text
 application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php -text
@@ -134,6 +139,13 @@ application/ship-simu/main/drives/motor/.htaccess -text
 application/ship-simu/main/drives/motor/class_Motor.php -text
 application/ship-simu/main/factories/.htaccess -text
 application/ship-simu/main/factories/class_ShipSimuWebNewsFactory.php -text
+application/ship-simu/main/filter/.htaccess -text
+application/ship-simu/main/filter/page/.htaccess -text
+application/ship-simu/main/filter/page/class_MoneyRefillPageFilter.php -text
+application/ship-simu/main/filter/validator/.htaccess -text
+application/ship-simu/main/filter/validator/class_MoneyRefillRequestValidatorFilter.php -text
+application/ship-simu/main/goverment/.htaccess -text
+application/ship-simu/main/goverment/class_SimplifiedGoverment.php -text
 application/ship-simu/main/login/.htaccess -text
 application/ship-simu/main/login/class_ShipSimuGuestLogin.php -text
 application/ship-simu/main/login/class_ShipSimuUserLogin.php -text
@@ -176,13 +188,22 @@ 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/user/.htaccess -text
+application/ship-simu/main/user/class_ShipSimuBaseUser.php -text
+application/ship-simu/main/user/class_ShipSimuGuest.php -text
+application/ship-simu/main/user/class_ShipSimuMember.php -text
+application/ship-simu/main/user/extended/.htaccess -text
+application/ship-simu/main/user/extended/class_ShipSimuGuest.php -text
+application/ship-simu/main/user/extended/class_ShipSimuMember.php -text
 application/ship-simu/main/wrapper/.htaccess -text
 application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php -text
+application/ship-simu/main/wrapper/class_UserGovermentDatabaseWrapper.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_money_refill.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
@@ -213,8 +234,11 @@ application/ship-simu/templates/images/de/image/base_code.itp -text
 application/ship-simu/templates/images/de/image/code_captcha.itp -text
 /clear-cache.sh -text
 db/.htaccess -text
+db/company_user/.htaccess -text
+db/gov_user/.htaccess -text
 db/news/.htaccess -text
 db/user/.htaccess -text
+db/user_points/.htaccess -text
 devel/.htaccess -text
 devel/class_Debug.php -text
 docs/COPYING -text
@@ -266,7 +290,11 @@ inc/classes/exceptions/helper/.htaccess -text
 inc/classes/exceptions/helper/class_FormClosedException.php -text
 inc/classes/exceptions/helper/class_FormGroupClosedException.php -text
 inc/classes/exceptions/helper/class_FormOpenedException.php -text
+inc/classes/exceptions/helper/class_HelperGroupAlreadyCreatedException.php -text
+inc/classes/exceptions/helper/class_HelperNoPreviousOpenedSubGroupException.php -text
+inc/classes/exceptions/helper/class_HelperSubGroupAlreadyCreatedException.php -text
 inc/classes/exceptions/helper/class_InvalidFormNameException.php -text
+inc/classes/exceptions/helper/class_NoGroupOpenedException.php -text
 inc/classes/exceptions/helper/class_UserInstanceMissingException.php -text
 inc/classes/exceptions/io/.htaccess -text
 inc/classes/exceptions/io/class_DirPointerNotOpenedException.php -text
@@ -300,7 +328,6 @@ inc/classes/exceptions/main/class_GetterNotFoundException.php -text
 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
@@ -476,6 +503,7 @@ inc/classes/main/controller/web/class_WebLoginController.php -text
 inc/classes/main/controller/web/class_WebLoginFailedController.php -text
 inc/classes/main/controller/web/class_WebLogoutDoneController.php -text
 inc/classes/main/controller/web/class_WebRegisterController.php -text
+inc/classes/main/controller/web/class_WebStatusController.php -text
 inc/classes/main/criteria/.htaccess -text
 inc/classes/main/criteria/class_DataSetCriteria.php -text
 inc/classes/main/criteria/class_SearchCriteria.php -text
@@ -491,6 +519,7 @@ inc/classes/main/database/databases/class_LocalFileDatabase.php -text
 inc/classes/main/database/wrapper/.htaccess -text
 inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php -text
 inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php -text
+inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php -text
 inc/classes/main/debug/.htaccess -text
 inc/classes/main/debug/class_DebugConsoleOutput.php -text
 inc/classes/main/debug/class_DebugErrorLogOutput.php -text
@@ -536,7 +565,6 @@ inc/classes/main/filter/validator/class_UserNameValidatorFilter.php -text
 inc/classes/main/filter/verifier/.htaccess -text
 inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php -text
-inc/classes/main/filter/verifier/class_EmailValidatorFilter.php -text
 inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php -text
 inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php -text
@@ -585,6 +613,8 @@ inc/classes/main/mailer/debug/class_DebugMailer.php -text
 inc/classes/main/output/.htaccess -text
 inc/classes/main/output/class_ConsoleOutput.php -text
 inc/classes/main/output/class_WebOutput.php -text
+inc/classes/main/points/.htaccess -text
+inc/classes/main/points/class_UserPoints.php -text
 inc/classes/main/reader/.htaccess -text
 inc/classes/main/reader/class_DefaultNewsReader.php -text
 inc/classes/main/registration/.htaccess -text
@@ -643,6 +673,11 @@ inc/classes/middleware/debug/class_DebugMiddleware.php -text
 inc/classes/middleware/io/.htaccess -text
 inc/classes/middleware/io/class_FileIoHandler.php -text
 inc/classes/third_party/.htaccess -text
+inc/classes/third_party/api/.htaccess -text
+inc/classes/third_party/api/primusportal/.htaccess -text
+inc/classes/third_party/api/primusportal/class_PrimeraApi.php -text
+inc/classes/third_party/api/wernisportal/.htaccess -text
+inc/classes/third_party/api/wernisportal/class_WernisApi.php -text
 inc/classes/third_party/php_mailer/.htaccess -text
 inc/classes/third_party/php_mailer/ChangeLog.txt -text
 inc/classes/third_party/php_mailer/LICENSE -text
@@ -728,6 +763,7 @@ inc/output.php -text
 inc/selector.php -text
 /index.php -text
 /package.sh -text
+/pdepend.sh -text
 /rebuild_doc.sh -text
 templates/.htaccess -text
 templates/_compiled/.htaccess -text