Rubén D 89a5740e4d Merge remote-tracking branch 'origin/master' ...

Conflicts:
	ajax/ajax_upgrade.php
	app/modules/api/Controllers/Help/HelpTrait.php
	app/modules/web/Controllers/Helpers/Grid/GridInterface.php
	app/modules/web/Controllers/Helpers/HelperException.php
	app/modules/web/Forms/FormBase.php
	app/modules/web/themes/material-blue/css/search-card.css.map
	app/modules/web/themes/material-blue/css/search-grid.css.map
	app/modules/web/themes/material-blue/css/selectize-custom.css.map
	app/modules/web/themes/material-blue/css/selectize-custom.min.css
	app/modules/web/themes/material-blue/css/styles.min.css
	app/modules/web/themes/material-blue/js/app-theme.map
	app/modules/web/themes/material-blue/js/app-theme.min.js
	app/modules/web/themes/material-blue/views/plugin/index.inc
	inc/SP/Controller/TabControllerBase.class.php
	inc/SP/Controller/TabsInterface.class.php
	inc/SP/Log/LogUtil.class.php
	inc/SP/Mgmt/Files/FileBase.class.php
	lib/BaseFunctions.php
	lib/SP/Config/ConfigInterface.php
	lib/SP/Core/Acl/ActionNotFoundException.php
	lib/SP/Core/Context/ContextCollection.php
	lib/SP/Core/Context/ContextException.php
	lib/SP/Core/Crypt/Cookie.php
	lib/SP/Core/Crypt/Crypt.php
	lib/SP/Core/Crypt/CryptSessionHandler.php
	lib/SP/Core/Crypt/Hash.php
	lib/SP/Core/Crypt/SecureKeyCookie.php
	lib/SP/Core/Crypt/Session.php
	lib/SP/Core/Crypt/UUIDCookie.php
	lib/SP/Core/Crypt/Vault.php
	lib/SP/Core/DataCollection.php
	lib/SP/Core/Events/EventDispatcher.php
	lib/SP/Core/Events/EventDispatcherInterface.php
	lib/SP/Core/Events/EventReceiver.php
	lib/SP/Core/Exceptions/ConfigException.php
	lib/SP/Core/Exceptions/ConstraintException.php
	lib/SP/Core/Exceptions/FileNotFoundException.php
	lib/SP/Core/Exceptions/InitializationException.php
	lib/SP/Core/Exceptions/InvalidArgumentException.php
	lib/SP/Core/Exceptions/InvalidClassException.php
	lib/SP/Core/Exceptions/InvalidImageException.php
	lib/SP/Core/Exceptions/ItemException.php
	lib/SP/Core/Exceptions/NoSuchPropertyException.php
	lib/SP/Core/Exceptions/QueryException.php
	lib/SP/Core/Exceptions/ValidationException.php
	lib/SP/Core/ItemsTypeInterface.php
	lib/SP/Core/Messages/MessageInterface.php
	lib/SP/Core/Messages/TaskMessage.php
	lib/SP/Core/PhpExtensionChecker.php
	lib/SP/Core/UI/ThemeIconsInterface.php
	lib/SP/Core/UI/ThemeInterface.php
	lib/SP/DataModel/AccountData.php
	lib/SP/DataModel/AccountExtData.php
	lib/SP/DataModel/AccountHistoryData.php
	lib/SP/DataModel/AccountSearchVData.php
	lib/SP/DataModel/AccountToUserGroupData.php
	lib/SP/DataModel/AccountVData.php
	lib/SP/DataModel/ActionData.php
	lib/SP/DataModel/AuthTokenData.php
	lib/SP/DataModel/CategoryData.php
	lib/SP/DataModel/ClientData.php
	lib/SP/DataModel/ConfigData.php
	lib/SP/DataModel/CustomFieldBaseData.php
	lib/SP/DataModel/CustomFieldDefinitionData.php
	lib/SP/DataModel/CustomFieldTypeData.php
	lib/SP/DataModel/DataModelBase.php
	lib/SP/DataModel/DataModelInterface.php
	lib/SP/DataModel/Dto/AccountSearchResponse.php
	lib/SP/DataModel/FileData.php
	lib/SP/DataModel/FileExtData.php
	lib/SP/DataModel/ItemData.php
	lib/SP/DataModel/ItemPreset/AccountPermission.php
	lib/SP/DataModel/ItemPreset/AccountPrivate.php
	lib/SP/DataModel/ItemPreset/Password.php
	lib/SP/DataModel/ItemPreset/SessionTimeout.php
	lib/SP/DataModel/ItemPresetData.php
	lib/SP/DataModel/ItemSearchData.php
	lib/SP/DataModel/PluginData.php
	lib/SP/DataModel/ProfileData.php
	lib/SP/DataModel/PublicLinkData.php
	lib/SP/DataModel/UserData.php
	lib/SP/DataModel/UserLoginData.php
	lib/SP/DataModel/UserPassData.php
	lib/SP/DataModel/UserPassRecoverData.php
	lib/SP/DataModel/UserProfileData.php
	lib/SP/DataModel/UserToUserGroupData.php
	lib/SP/Html/Assets/FontIcon.php
	lib/SP/Html/Assets/IconBase.php
	lib/SP/Html/Assets/IconInterface.php
	lib/SP/Html/Assets/ImageIcon.php
	lib/SP/Html/DataGrid/DataGridData.php
	lib/SP/Html/DataGrid/DataGridSortInterface.php
	lib/SP/Http/Client.php
	lib/SP/Http/JsonResponse.php
	lib/SP/Http/Message.php
	lib/SP/Http/Uri.php
	lib/SP/Http/Xml.php
	lib/SP/Mvc/Controller/CrudControllerInterface.php
	lib/SP/Mvc/Controller/Validators/ValidatorInterface.php
	lib/SP/Mvc/Model/QueryAssignment.php
	lib/SP/Mvc/Model/QueryJoin.php
	lib/SP/Mvc/View/Components/ItemAdapterInterface.php
	lib/SP/Providers/Auth/AuthDataBase.php
	lib/SP/Providers/Auth/AuthInterface.php
	lib/SP/Providers/Auth/AuthResult.php
	lib/SP/Providers/Auth/Browser/Browser.php
	lib/SP/Providers/Auth/Browser/BrowserAuthData.php
	lib/SP/Providers/Auth/Database/Database.php
	lib/SP/Providers/Auth/Database/DatabaseAuthData.php
	lib/SP/Providers/Auth/Ldap/LdapAuthData.php
	lib/SP/Providers/Auth/Ldap/LdapCode.php
	lib/SP/Providers/Auth/Ldap/LdapException.php
	lib/SP/Providers/EventsTrait.php
	lib/SP/Providers/Mail/MailParams.php
	lib/SP/Providers/Mail/MailProviderException.php
	lib/SP/Providers/Provider.php
	lib/SP/Repositories/Config/ConfigRepository.php
	lib/SP/Repositories/CustomField/CustomFieldDefCollection.php
	lib/SP/Repositories/CustomField/CustomFieldRepository.php
	lib/SP/Repositories/DuplicatedItemException.php
	lib/SP/Repositories/Repository.php
	lib/SP/Services/Account/AccountInterface.php
	lib/SP/Services/Account/AccountSearchFilter.php
	lib/SP/Services/Account/AccountToFavoriteService.php
	lib/SP/Services/Account/AccountToTagService.php
	lib/SP/Services/Api/ApiRequestException.php
	lib/SP/Services/Api/ApiResponse.php
	lib/SP/Services/Api/JsonRpcResponse.php
	lib/SP/Services/Auth/AuthException.php
	lib/SP/Services/Auth/LoginResponse.php
	lib/SP/Services/Crypt/MasterPassService.php
	lib/SP/Services/Crypt/UpdateMasterPassRequest.php
	lib/SP/Services/CustomField/CustomFieldItem.php
	lib/SP/Services/EventLog/EventlogService.php
	lib/SP/Services/Export/VerifyResult.php
	lib/SP/Services/Import/ImportException.php
	lib/SP/Services/Import/ImportInterface.php
	lib/SP/Services/Import/ImportParams.php
	lib/SP/Services/Install/DatabaseSetupInterface.php
	lib/SP/Services/Install/InstallData.php
	lib/SP/Services/ItemPreset/ItemPresetInterface.php
	lib/SP/Services/Ldap/LdapImportParams.php
	lib/SP/Services/ServiceException.php
	lib/SP/Services/ServiceItemInterface.php
	lib/SP/Services/Upgrade/UpgradeException.php
	lib/SP/Services/Upgrade/UpgradeInterface.php
	lib/SP/Services/User/UpdatePassRequest.php
	lib/SP/Services/User/UserLoginRequest.php
	lib/SP/Services/User/UserLoginResponse.php
	lib/SP/Services/User/UserPassResponse.php
	lib/SP/Storage/Database/DBStorageInterface.php
	lib/SP/Storage/Database/DatabaseConnectionData.php
	lib/SP/Storage/Database/DatabaseException.php
	lib/SP/Storage/Database/MySQLFileParser.php
	lib/SP/Storage/Database/QueryResult.php
	lib/SP/Storage/File/FileException.php
	lib/SP/Storage/File/XmlFileStorageInterface.php
	lib/SP/Util/ArrayUtil.php
	lib/SP/Util/Checks.php
	lib/SP/Util/ConnectionInterface.php
	lib/SP/Util/DateUtil.php
	lib/SP/Util/Filter.php
	lib/SP/Util/HttpUtil.php
	public/css/fonts.css
	public/js/app-actions.min.js
	public/js/app-triggers.min.js
	public/js/app-util.min.js
	public/vendor/css/reset.css
	public/vendor/css/toastr.css
	public/vendor/fonts/MaterialIcons-Regular.svg
	public/vendor/js/clipboard.js
	public/vendor/js/eventsource.min.js
	public/vendor/js/jquery-3.3.1.js
	public/vendor/js/jquery-3.3.1.min.js
	public/vendor/js/jquery-migrate-3.0.0.min.js
	public/vendor/js/moment-timezone.js
	public/vendor/js/moment-timezone.min.js
	public/vendor/js/zxcvbn-async.js
	public/vendor/js/zxcvbn-async.min.js
	schemas/30018010101.sql
	schemas/30018072302.sql
	schemas/30018072501.sql
	schemas/30018083001.sql
	schemas/30018083002.sql
	tests/SP/Core/Crypt/CryptTest.php
	tests/SP/Core/Crypt/SecureKeyCookieTest.php
	tests/SP/DatabaseTestCase.php
	tests/SP/Http/AddressTest.php
	tests/SP/Modules/Api/Controllers/CategoryControllerTest.php
	tests/SP/Modules/Api/Controllers/ClientControllerTest.php
	tests/SP/Modules/Api/Controllers/ConfigControllerTest.php
	tests/SP/Modules/Api/Controllers/TagControllerTest.php
	tests/SP/Mvc/Controller/Validators/ValidatorTest.php
	tests/SP/Repositories/AccountFileRepositoryTest.php
	tests/SP/Repositories/AccountToFavoriteRepositoryTest.php
	tests/SP/Repositories/AccountToTagRepositoryTest.php
	tests/SP/Repositories/CategoryRepositoryTest.php
	tests/SP/Repositories/ClientRepositoryTest.php
	tests/SP/Repositories/ConfigRepositoryTest.php
	tests/SP/Repositories/CustomFieldDefRepositoryTest.php
	tests/SP/Repositories/CustomFieldRepositoryTest.php
	tests/SP/Repositories/CustomFieldTypeRepositoryTest.php
	tests/SP/Repositories/EventlogRepositoryTest.php
	tests/SP/Repositories/PluginRepositoryTest.php
	tests/SP/Repositories/TagRepositoryTest.php
	tests/SP/Repositories/UserGroupRepositoryTest.php
	tests/SP/Repositories/UserProfileRepositoryTest.php
	tests/SP/Repositories/UserRepositoryTest.php
	tests/SP/Repositories/UserToUserGroupRepositoryTest.php
	tests/SP/Services/Account/AccountCryptServiceTest.php
	tests/SP/Services/Account/AccountSearchServiceTest.php
	tests/SP/Services/Account/AccountToFavoriteServiceTest.php
	tests/SP/Services/Account/AccountToTagServiceTest.php
	tests/SP/Services/Api/ApiRequestTest.php
	tests/SP/Services/Api/ApiServiceTest.php
	tests/SP/Services/Client/ClientServiceTest.php
	tests/SP/Services/Config/ConfigServiceTest.php
	tests/SP/Services/Crypt/MasterPassServiceTest.php
	tests/SP/Services/Crypt/SecureSessionServiceTest.php
	tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php
	tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php
	tests/SP/Services/CustomField/CustomFieldDefServiceTest.php
	tests/SP/Services/CustomField/CustomFieldServiceTest.php
	tests/SP/Services/Eventlog/EventlogServiceTest.php
	tests/SP/Services/Import/SyspassImportTest.php
	tests/SP/Services/Import/XmlFileImportTest.php
	tests/SP/Services/Import/XmlImportTest.php
	tests/SP/Services/Plugin/PluginServiceTest.php
	tests/SP/Services/Tag/TagServiceTest.php
	tests/SP/Services/User/UserPassServiceTest.php
	tests/SP/Services/User/UserServiceTest.php
	tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php
	tests/SP/Services/UserProfile/UserProfileServiceTest.php
	tests/SP/Storage/FileHandlerTest.php
	tests/SP/Storage/XmlHandlerTest.php
	tests/res/config/actions.xml
	tests/res/datasets/syspass.xml
	tests/res/datasets/syspass_account.xml
	tests/res/datasets/syspass_accountAcl.xml
	tests/res/datasets/syspass_accountCrypt.xml
	tests/res/datasets/syspass_accountFavorite.xml
	tests/res/datasets/syspass_accountFile.xml
	tests/res/datasets/syspass_accountHistory.xml
	tests/res/datasets/syspass_accountSearch.xml
	tests/res/datasets/syspass_authToken.xml
	tests/res/datasets/syspass_config.xml
	tests/res/datasets/syspass_customField.xml
	tests/res/datasets/syspass_eventlog.xml
	tests/res/datasets/syspass_plugin.xml
	tests/res/datasets/syspass_publicLink.xml
	tests/res/datasets/syspass_tag.xml
	tests/res/datasets/syspass_track.xml
	tests/res/datasets/syspass_user.xml
	tests/res/datasets/syspass_userGroup.xml
	tests/res/import/data.csv
	tests/res/import/data_empty.xml
	tests/res/import/data_invalid.csv
	tests/res/import/data_keepass.xml
	tests/res/import/data_syspass.xml
	tests/res/import/data_syspass_encrypted.xml
	tests/res/import/data_syspass_invalid.xml
	tests/res/import/data_syspass_valid_hash.xml
	tests/res/json/account_add.json
	tests/res/json/account_search.json
	tests/res/json/account_viewPass.json

2019-01-15 16:21:56 +01:00

829 B

Raw Permalink Blame History

View Raw