Commit graph

667 commits

Author SHA1 Message Date
alextselegidis
d2be2327e8 Minor refactoring for the appointments page 2021-11-12 17:09:39 +01:00
alextselegidis
eb64b6c7ef The google analytics code does not need to be loaded twice 2021-11-12 17:09:01 +01:00
alextselegidis
3fa817d52d Renamed the email templates for more consistency 2021-11-12 16:58:55 +01:00
alextselegidis
007e95ed7a Moved the installation and update pages to the new view/pages directory 2021-11-12 16:57:05 +01:00
alextselegidis
0b9f7ecea2 Updated the routes.php config file comments and added the missing "translate_uri_dashes" config entry 2021-11-12 16:54:21 +01:00
alextselegidis
cf579dddc2 Removed the error override configuration and files 2021-11-12 16:53:42 +01:00
alextselegidis
ee6729cf0b Converted all the account related pages to the new layout structure 2021-11-12 16:51:25 +01:00
alextselegidis
64846e0107 Removed the appointments directory from the view files 2021-11-12 16:40:12 +01:00
alextselegidis
9fdafa5497 Converted the booking message to the booking message layout 2021-11-12 16:39:38 +01:00
alextselegidis
b31b4c87bd Converted the booking success page to the layout structure 2021-11-12 16:33:01 +01:00
alextselegidis
35393642fa Default value for the styles, scripts and global variables entry 2021-11-12 16:32:31 +01:00
alextselegidis
d96e65792b Converted the booking page view files to the layout structure 2021-11-12 08:38:20 +01:00
alextselegidis
2479ffb3a1 Changed the users callback to use the layout loading method 2021-11-12 08:37:50 +01:00
alextselegidis
3ca9211449 Created the backend layout and moved all of its templates into the new "pages" directory 2021-11-12 08:25:27 +01:00
alextselegidis
fa313c3ef3 Moved partial and other reusable view files into the new "components" directory 2021-11-12 08:24:43 +01:00
alextselegidis
ad3d726d1a Added new layout loading method to the EA_Loader.php file. 2021-11-12 08:22:49 +01:00
alextselegidis
2d681a774a Autoload the new component helper 2021-11-11 09:01:57 +01:00
alextselegidis
179e72bfb9 Changed the directory of the render functions to "components" 2021-11-11 09:01:42 +01:00
alextselegidis
538ded7d69 Added new component helper file 2021-11-11 09:00:48 +01:00
alextselegidis
0e8ebc8110 Added doc blocks for template vars and did minor template fixes 2021-11-10 08:32:46 +01:00
alextselegidis
44fffb1c56 Moved the remaining modals into their own files. 2021-11-09 08:53:09 +01:00
alextselegidis
2068f70840 Moved the modal view files to a new modals directory 2021-11-09 08:47:09 +01:00
alextselegidis
fb92fa1832 Updated the meta html tag of the view files 2021-11-09 08:44:37 +01:00
alextselegidis
6c356aec50 Added new functions to the render helper that render the global variables and EALang scripts into a view file 2021-11-09 08:40:20 +01:00
alextselegidis
6d567a74a4 Added new layout method to the loader 2021-11-09 08:39:30 +01:00
alextselegidis
cd9a92bed9 Removed the polyfill scripts as it is no longer needed. 2021-11-09 08:11:33 +01:00
Alex Tselegidis
f371177fb6 Updated the vendor script paths in the view files 2021-11-08 10:57:03 +01:00
Alex Tselegidis
f41547b77d Method could also return null and not always an int 2021-11-08 10:44:36 +01:00
Alex Tselegidis
85bd7b9b38 Renamed attach to load in Backend_api.php 2021-11-06 17:14:57 +01:00
Alex Tselegidis
331aa8c174 Moved the old BASE URL to the app configuration for use in mails etc where a public facing URL is required 2021-11-06 17:11:09 +01:00
Alex Tselegidis
1c88a2f987 The app will now automatically detect the BASE URL based on the current request. 2021-11-06 17:07:03 +01:00
Alex Tselegidis
4a696fc992 Changed the develop state version 2021-11-06 16:54:34 +01:00
Alex Tselegidis
5f211f3cf1 Updated comment 2021-11-06 16:53:57 +01:00
Alex Tselegidis
356629fab6 Minor formatting 2021-11-06 16:52:52 +01:00
Alex Tselegidis
3e1381c302 Moved the app related config in a new app.php config file 2021-11-06 16:52:46 +01:00
Alex Tselegidis
a20f2e9e33 Corrected the login HTTP callback 2021-11-06 16:51:36 +01:00
Alex Tselegidis
54e86795d5 Minor comment changes for consistency 2021-11-06 16:21:27 +01:00
Alex Tselegidis
245fc43ec1 Replaced the old engine class use with the new Email_messages library 2021-11-06 16:11:55 +01:00
Alex Tselegidis
130adf88c3 Created new email messages library (ported the deprecated engine email class) 2021-11-06 16:11:44 +01:00
Alex Tselegidis
31b452766d Refactored the login controller callback 2021-11-06 16:09:59 +01:00
Alex Tselegidis
e38df7452b Renamed the attach query paramter of API controllers to with 2021-11-06 15:41:11 +01:00
Alex Tselegidis
c68565e2c3 Renamed the attached method to load for all models 2021-11-06 15:40:55 +01:00
Alex Tselegidis
f36c49819c Added support for the "attach" query parameter to all API controllers 2021-11-06 15:34:54 +01:00
Alex Tselegidis
bd8144f7cb Make sure the attach method works with API properties 2021-11-06 15:34:35 +01:00
Alex Tselegidis
89b9c802a2 Unavailabilities can only attach a provider record 2021-11-06 15:21:11 +01:00
Alex Tselegidis
bcc9b88623 Added support for upgrading and downgrading manually the database via the CLI 2021-11-06 15:17:03 +01:00
Alex Tselegidis
0a88442aa2 Corrected the settings routing config 2021-11-06 15:04:26 +01:00
Alex Tselegidis
8603a8ae33 Refactored all the API controller classes (and renamed them) to work well on top of the models 2021-11-06 15:03:08 +01:00
Alex Tselegidis
b4f903e724 Various fixes and additions to the model classes 2021-11-06 15:02:40 +01:00
Alex Tselegidis
1883b97630 Fixed API authorization issue 2021-11-06 15:01:17 +01:00
Alex Tselegidis
27c5c3ab35 Replaced the appointments model with the unavailabilities model in the Backend_api.php 2021-11-06 14:56:56 +01:00
Alex Tselegidis
00f54dcfec Added the new Unavailabilities_model @property to EA_Controller.php 2021-11-06 14:56:12 +01:00
Alex Tselegidis
c7bb9d3a47 Added new Unavailabilities_model.php to enable handling such records as an independent resource 2021-11-06 14:55:36 +01:00
Alex Tselegidis
2406eefd39 Added validation to the sort direction value 2021-11-06 13:30:12 +01:00
Alex Tselegidis
01dfdf22f1 Added manual imports so that the migration system works again 2021-11-06 11:15:32 +01:00
Alex Tselegidis
4020e40a25 Corrected settings and availabilities routes 2021-11-06 11:15:15 +01:00
Alex Tselegidis
169b9818a6 Use the new routes helper in the routes.php config file 2021-11-06 10:23:25 +01:00
Alex Tselegidis
308e41bbe1 Autoload the new routes_helper.php file 2021-11-06 10:22:09 +01:00
Alex Tselegidis
3476807b40 Added the routes helper file 2021-11-06 10:18:46 +01:00
Alex Tselegidis
ba77658551 Ported the api parser encode and decode into the model classes 2021-11-05 09:37:14 +01:00
Alex Tselegidis
95a4e94a53 The response helper function must properly set the status code and the headers 2021-11-05 08:31:37 +01:00
Alex Tselegidis
3c5be0d12b The set setting method could also get a NULL value 2021-11-05 08:28:59 +01:00
Alex Tselegidis
afc05577a4 Refactored the admins API controller (no engine code is being used). 2021-11-03 08:38:59 +01:00
Alex Tselegidis
ea659ccb9f The base model knows how to map an API resource field to a DB field. 2021-11-03 08:22:27 +01:00
Alex Tselegidis
c390a6552a Using the request helper without specifying a key should return the entire request body. 2021-11-03 08:22:05 +01:00
Alex Tselegidis
10ee3401e4 The API library can correctly sort and set the CORS headers 2021-11-03 08:21:30 +01:00
Alex Tselegidis
6eaa6e52a5 Added API resource mapping 2021-11-03 08:21:03 +01:00
Alex Tselegidis
4c6c5b5913 Remove the old and deprecated API_V1_Controller.php 2021-11-02 10:45:05 +01:00
Alex Tselegidis
7d3bc3104c Created new library that handles common API functionality. 2021-11-02 10:44:37 +01:00
Alex Tselegidis
c2127a28fb Added missing comments 2021-11-02 10:04:46 +01:00
Alex Tselegidis
dc50f8dee1 Updated @since tag 2021-11-02 09:24:28 +01:00
Alex Tselegidis
bdaa46459c The new settings model does not have the set_setting and get_setting values. 2021-10-29 13:21:03 +02:00
Alex Tselegidis
306e94a082 The delete model method does not return a result any more. 2021-10-29 13:20:33 +02:00
Alex Tselegidis
4ed7465784 Corrected the name of the exception variable 2021-10-29 13:16:21 +02:00
Alex Tselegidis
182cebfb74 Renamed the add_unavailable method to save_unavailable for consistency 2021-10-29 13:12:39 +02:00
Alex Tselegidis
e29c2198de Removed the delete_unavailable method 2021-10-29 13:11:56 +02:00
Alex Tselegidis
8b02cbb369 Added missing type hints for method params 2021-10-29 13:10:54 +02:00
Alex Tselegidis
3dee2ef4ef Added missing @method tag in phpdoc comments 2021-10-29 13:10:36 +02:00
Alex Tselegidis
8947500968 If the request does not have the application/json content type header then return NULL 2021-10-29 13:08:41 +02:00
Alex Tselegidis
d886f6db16 Override the CSRF validation to support the X-CSRF header. 2021-10-29 13:06:56 +02:00
Alex Tselegidis
3233c19571 Added overrides for all the framework classes as templates and for consistency 2021-10-29 13:04:26 +02:00
Alex Tselegidis
12ec5c1ac3 The request helper can now also fetch JSON-payload attributes 2021-10-29 12:54:49 +02:00
Alex Tselegidis
dd546164fb Common type casting functionality 2021-10-29 12:39:49 +02:00
Alex Tselegidis
b7305be038 Type casting for the Users_model.php 2021-10-29 12:39:38 +02:00
Alex Tselegidis
d62dd9b053 Type casting for the Settings_model.php 2021-10-29 12:39:32 +02:00
Alex Tselegidis
83777d35ba Type casting for the Services_model.php 2021-10-29 12:39:27 +02:00
Alex Tselegidis
791f1e38e4 Type casting for the Service_categories_model.php 2021-10-29 12:39:20 +02:00
Alex Tselegidis
879b58ad6a Type casting for the Secretaries_model.php 2021-10-29 12:39:14 +02:00
Alex Tselegidis
23cdaa2c6b Type casting for the Roles_model.php 2021-10-29 12:39:08 +02:00
Alex Tselegidis
e0dbdeccfc Type casting for the Providers_model.php 2021-10-29 12:39:02 +02:00
Alex Tselegidis
9338ec4445 Type casting for the Customers_model.php 2021-10-29 12:38:56 +02:00
Alex Tselegidis
6cc17d7bf5 Type casting for the Consents_model.php 2021-10-29 12:38:49 +02:00
Alex Tselegidis
d1b78397ef Type casting for the Admins_model.php 2021-10-29 12:38:41 +02:00
Alex Tselegidis
64205cb23b Type casting for the Appointments_model.php 2021-10-29 12:38:30 +02:00
Alex Tselegidis
76afdef30b Moved the instance handling logic to a re-usable library 2021-10-29 10:44:01 +02:00
Alex Tselegidis
18348e02a5 Added core migration class. 2021-10-29 10:19:10 +02:00
Alex Tselegidis
9a528e6734 Updated the class comments 2021-10-29 10:18:44 +02:00
Alex Tselegidis
8ecf389bf1 Updated all the API controllers to work with the updated code. 2021-10-28 14:01:27 +02:00
Alex Tselegidis
a280496294 Updated all the main controllers to work with the updated code. 2021-10-28 14:01:17 +02:00
Alex Tselegidis
61a718cb2f Updated the Timezones.php library to work with the updated code. 2021-10-28 14:00:48 +02:00
Alex Tselegidis
8e11dddf4a Updated the Synchronization.php library to work with the updated code. 2021-10-28 14:00:40 +02:00
Alex Tselegidis
44aea4febb Updated the Notifications.php library to work with the updated code. 2021-10-28 14:00:33 +02:00
Alex Tselegidis
23d80259d9 Updated the Ics_file.php library to work with the updated code. 2021-10-28 14:00:18 +02:00
Alex Tselegidis
f540922abc Updated the Google_sync.php library to work with the updated code. 2021-10-28 14:00:10 +02:00
Alex Tselegidis
e4c01f54f8 Updated the Availability.php library to work with the updated code. 2021-10-28 13:59:56 +02:00
Alex Tselegidis
adc6d00bb5 Updated the Google Analytics and Permissions helper functions. 2021-10-28 13:59:27 +02:00
Alex Tselegidis
5e4bf0bd22 Corrected variable and table name 2021-10-28 13:51:46 +02:00
Alex Tselegidis
b2d2a5a1ce Updated the new accounts library. 2021-10-28 13:29:15 +02:00
Alex Tselegidis
198db17100 Minor formatting changes 2021-10-28 13:28:37 +02:00
Alex Tselegidis
18e89e1ba4 Minor formatting change 2021-10-28 13:27:47 +02:00
Alex Tselegidis
110e5ec17d Properly read and write settings via the settings helper 2021-10-28 13:27:14 +02:00
Alex Tselegidis
af58f924b1 Autoload the string helper as well 2021-10-28 13:26:48 +02:00
Alex Tselegidis
4671055a52 Corrected typo on get customer role ID method 2021-10-28 13:26:31 +02:00
Alex Tselegidis
0aaff2eae1 Removed manual helper loading 2021-10-27 12:05:28 +02:00
Alex Tselegidis
2e9bf9d29d Automatically load all the core helper files 2021-10-27 12:03:51 +02:00
Alex Tselegidis
a241e8b2a4 Removed teh custom_exceptions_helper.php file 2021-10-27 12:02:24 +02:00
Alex Tselegidis
c1db2b636c The content array must be encoded before returned 2021-10-27 11:44:45 +02:00
Alex Tselegidis
c495cd8225 Added the success prop to the json exception response payload 2021-10-27 11:19:45 +02:00
Alex Tselegidis
4bec35d70c Removed the : void return typehint 2021-10-27 10:49:42 +02:00
Alex Tselegidis
85ac86caae Updated class comment 2021-10-27 10:46:32 +02:00
Alex Tselegidis
e0ad767ec7 Updated @property tags in EA_Controller.php 2021-10-27 10:06:58 +02:00
Alex Tselegidis
40e06d2f19 The base model class has all the deprecated methods for backwards compatibility. 2021-10-27 10:06:44 +02:00
Alex Tselegidis
97c7a2821d Created the users model class. 2021-10-27 10:05:43 +02:00
Alex Tselegidis
de4c232488 Migrated the user model logic into the accounts library 2021-10-27 10:05:26 +02:00
Alex Tselegidis
d914a52c02 Created the service categories model class. 2021-10-27 10:04:59 +02:00
Alex Tselegidis
65282bc5a2 Updated the settings model class. 2021-10-27 10:04:48 +02:00
Alex Tselegidis
175b6a9ffe Updated the services model class. 2021-10-27 10:04:42 +02:00
Alex Tselegidis
8022ab28af Updated the secretaries model class. 2021-10-27 10:04:35 +02:00
Alex Tselegidis
a4cd74863b Updated the roles model class. 2021-10-27 10:04:28 +02:00
Alex Tselegidis
beeb821f8a Updated the providers model class. 2021-10-27 10:04:21 +02:00
Alex Tselegidis
024479e5c6 Updated the customers model class. 2021-10-27 10:04:15 +02:00
Alex Tselegidis
07925c58ef Updated the consents model class. 2021-10-27 10:04:09 +02:00
Alex Tselegidis
a72a33abb1 Updated the appointments model class. 2021-10-27 10:04:01 +02:00
Alex Tselegidis
5f2e5f1d28 Updated the admins model class. 2021-10-27 10:03:52 +02:00
Alex Tselegidis
f5471b0f2b Renamed and updated the password helper 2021-10-24 22:00:59 +02:00
Alex Tselegidis
658c131f79 Renamed and updated the validation helper 2021-10-24 22:00:16 +02:00
Alex Tselegidis
584e624139 Added deprecated method stubs for backwards compatibility 2021-10-24 14:16:35 +02:00
Alex Tselegidis
fa6e48b344 Corrected property tag order 2021-10-24 14:13:20 +02:00
Alex Tselegidis
6417db8ca1 Added fallback support for the model class deprecations 2021-10-23 19:33:55 +02:00
Alex Tselegidis
bee96c172a Corrected typo in class comment 2021-10-23 19:32:55 +02:00
Alex Tselegidis
bc1380ca89 Added helper file with permission related functions. 2021-10-23 19:19:21 +02:00
Alex Tselegidis
a97b6a4e13 Added helper file with http related functions. 2021-10-23 19:08:08 +02:00
Alex Tselegidis
e55c68fcb4 Added @throws tag at the comments 2021-10-23 13:42:23 +02:00
Alex Tselegidis
d636f60cbc Added short argument explanation 2021-10-23 13:41:41 +02:00
Alex Tselegidis
0a6b596dec Added examples at the comments 2021-10-23 13:38:54 +02:00
Alex Tselegidis
c117eda101 Set the right @since value for the new helper files 2021-10-23 13:29:31 +02:00
Alex Tselegidis
6d5a961fc7 Added helper file with path related functions. 2021-10-23 13:28:01 +02:00
Alex Tselegidis
4a7cdd96b2 Added helper file with setting related functions. 2021-10-23 13:21:30 +02:00
Alex Tselegidis
30c08bf95a Changed the return comment 2021-10-23 13:20:39 +02:00
Alex Tselegidis
af656d70e2 Changed the return comment 2021-10-23 13:20:33 +02:00
Alex Tselegidis
d70e6f21ce Added helper file with session related functions. 2021-10-23 13:18:20 +02:00
Alex Tselegidis
7a85ae6fc8 Updated the get example. 2021-10-23 13:17:38 +02:00
Alex Tselegidis
aad8e38bea Added additional comment 2021-10-23 13:13:43 +02:00
Alex Tselegidis
863caa31fd Added helper file with environment related functions. 2021-10-23 13:11:19 +02:00
Alex Tselegidis
b14341c328 Validate $key argument with empty instead with is_null 2021-10-23 13:10:09 +02:00
Alex Tselegidis
31c324dd92 Updated the exception message. 2021-10-23 13:08:24 +02:00
Alex Tselegidis
8abeb4dbf2 Added new helper file with debugging related functions 2021-10-23 13:07:00 +02:00
Alex Tselegidis
85a6be1d7d Changed the exception instance to InvalidArgument exception. 2021-10-23 13:06:41 +02:00
Alex Tselegidis
1492963dee The config helper function can now also set a value. 2021-10-23 13:04:15 +02:00
Alex Tselegidis
727391aa8f Added default value to the config helper 2021-10-23 12:59:39 +02:00
Tthecreator
ff89857934
Update style of Client Form menu
Co-authored-by: Vitor Mattos <vitor@php.rio>
2021-10-20 22:18:40 +02:00
Thomas Saedt
9671def4ea Merge branch 'develop' into 1081_hide_data_fields 2021-10-20 22:12:47 +02:00
Alex Tselegidis
1664ac6f9f
Merge pull request #1119 from om-ha/patch-1
FIX Providers API incorrect `array_key_exists`
2021-10-18 13:58:42 +02:00
Alex Tselegidis
6606340da4 Update French translations (#1107). 2021-10-18 13:54:38 +02:00
Alex Tselegidis
6b179c3b58 When selecting the any provider option in the booking page then merge all the available hours of all providers that can serve the selected service (#1147). 2021-10-18 13:04:32 +02:00
Alex Tselegidis
86bc718782 Condier unavailable time periods that span into multiple days (#880). 2021-10-18 12:43:40 +02:00
Alex Tselegidis
03f5fed5a6 Merge branch 'lourdas-master' into develop 2021-10-04 09:38:20 +02:00
Alex Tselegidis
53acb6146c Mark required the fields of the settings page 2021-10-04 09:27:50 +02:00
Alex Tselegidis
0c0ac6a0b2 The backend appointment removal is using the notifications library 2021-10-04 09:26:12 +02:00
Alex Tselegidis
a210c32b73 Czech translation corrections 2021-10-04 09:25:44 +02:00
Vasileios Lourdas
0d708077ca Updated Greek language file.
Fixed a few typos and translated a couple of messages.
2021-09-26 20:01:24 +03:00
om-ha
a17c234698
FIX Providers API incorrect array_key_exists
- `array_key_exists` should search for they key `working_plan` within `$provider['settings']` and not `$provider['settings']['working_plan']`
2021-08-28 14:50:01 +03:00
Alex Tselegidis
49197b5c66 Use the right bootstrap CSS classes for the setting input field help blocks 2021-08-24 16:01:44 +03:00
Alex Tselegidis
591de3d35f Corrected model comments 2021-08-24 16:01:17 +03:00
Alex Tselegidis
7393c36462 Release v1.4.2 2021-07-27 11:31:43 +03:00
Alex Tselegidis
215c4f501e Release v1.4.2-beta.1 2021-07-19 18:25:36 +03:00
Alex Tselegidis
6103b6992d The timepicker sliders do not work when using an iOS device. #1026 2021-07-19 17:26:24 +03:00
Alex Tselegidis
5d513ea43f Resolve availability generation issue with 5 minute services. 2021-07-19 16:59:41 +03:00
Alex Tselegidis
9ddc820176 Set minimum service duration field value to honor the value of EVENT_MINIMUM_DURATION. #1068 2021-07-19 16:59:21 +03:00
Alex Tselegidis
5a039f2757 Missing Pacific (and potentially other) timezones (#980). 2021-07-19 16:07:26 +03:00
Alex Tselegidis
bdd45f448a
Merge pull request #1055 from LibreCodeCoop/pt_br_translate
Update pt_BR translations
2021-07-19 14:24:19 +03:00
Alex Tselegidis
ea8798d2a6 The model base class needs a constructor when running the app with PHP8.0 2021-07-19 14:03:40 +03:00
Alex Tselegidis
3c4e7923ce Removed duplicate row from the configuration file. 2021-07-19 13:42:29 +03:00
Alex Tselegidis
dfdbea6214 HTTP_ACCEPT_LANGUAGE is not set when executing the app from the console. 2021-06-14 10:21:43 +02:00
Thomas Saedt
bc87d5a573 [1081] added rudimentary translations for client form settings 2021-05-30 13:53:06 +02:00
Thomas Saedt
1bcbf9f71b [1081] Made show booking form field settings functional 2021-05-30 13:27:39 +02:00
Thomas S
ea2cdeff70 [1081] Added visual buttons to hide or show form fields 2021-05-29 20:58:08 +02:00
Thomas S
872640c46d [1081] Frontend hiding of fields 2021-05-28 15:39:14 +02:00
Thomas S
094b780fd8 [1081] Add new settings in db 2021-05-28 13:37:58 +02:00
Alex Tselegidis
4f0b2c6c8f Make sure admins do not get notified on appointment removals, if their notification setting is deactivated (#1074). 2021-05-17 12:57:06 +02:00
Vitor Mattos
ab07b585f0 Update translation 2021-04-16 20:51:31 -03:00
Vitor Mattos
de867ef4c5 Remove duplicated translate key 2021-04-16 20:33:14 -03:00
Vitor Mattos
ca57834262 New translation 2021-04-16 19:14:13 -03:00
Vitor Mattos
f6437ce1bc Update pt_BR translations 2021-04-16 14:08:59 -03:00
Winfried Mosler
95dfc866e1 fix calendar table events for roles other than admin 2021-04-07 10:52:09 +02:00
Alex Tselegidis
33693af996
Merge pull request #1022 from Mips2648/patch-1
fix notification to secretaries
2021-04-07 10:49:06 +02:00
Alex Tselegidis
f9bb741810 Merge branch 'add-ga4-support' of https://github.com/c0un7-z3r0/easyappointments into develop
# Conflicts:
#	application/language/german/translations_lang.php
2021-04-07 10:44:00 +02:00
Alex Tselegidis
25ca6a2349 Added additional translation files in the persian languages directory 2021-04-07 10:35:53 +02:00
Alex Tselegidis
65bc7a2092 Merge branch 'develop' of https://github.com/mhsenpc/easyappointments into develop
# Conflicts:
#	application/config/config.php
2021-04-07 10:35:00 +02:00
Alex Tselegidis
fc82005a41 German language corrections (#1009). 2021-04-07 10:32:15 +02:00