maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity
2084 commits 2 branches 42 tags 38 MiB
Commit graph

442 commits

Author SHA1 Message Date
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
Alex Tselegidis
60254558a3 Merge branch 'master' of https://github.com/cbka/easyappointments into develop 2021-04-07 10:11:30 +02:00
Alex Tselegidis
1c763f3870 Support all-day events while syncing with Google Calendar (#1040). 2021-04-07 10:02:30 +02:00
Alex Tselegidis
718fbf97aa
Merge pull request #967 from bevanjkay/all-day-google-events 
All day google events
 2021-04-07 09:49:35 +02:00
David Kagerer
acbce19a50 feat: add ga4 property support 
Since google analytics is using now GA4 the support for the new script was needed
 2021-03-30 21:13:59 +02:00
cbka
015a01b58a
Update email.php 2021-03-27 19:56:40 +01:00
cbka
bf57e028e6
Update email.php 2021-03-27 19:40:36 +01:00
Alex Tselegidis
e79c2d558e Added comment at the end of the language files so that new keys can be easily inserted 2021-03-25 12:38:29 +01:00
Alex Tselegidis
0af112723d Added missing translation keys in language files 2021-03-25 12:34:46 +01:00
Alex Tselegidis
ecdb7a662e Czech language translation corrections 2021-03-25 12:08:55 +01:00
Alex Tselegidis
76672db959 Make sure that the duration of a service does not become less than the minimum acceptable value as otherwise it will make problems with the availability generation 2021-03-25 11:32:10 +01:00
Alex Tselegidis
e496105fac Added missing translation files into the language/*/ directories 2021-03-25 11:26:11 +01:00
Alex Tselegidis
0b604dc229 Added missing translation keys to that czech language file 2021-03-25 11:15:03 +01:00
Alex Tselegidis
b6a17d4e11 Missing language mappings would cause issues with the auto-detection of the user's language. 2021-03-22 19:18:38 +01:00
Mips2648
45273fe707
fix notification to secretaries 2021-03-12 19:48:19 +01:00
Alex Tselegidis
99a5423e41 Updated catalan translations files (thanks to Marc Folch) 2021-02-18 14:32:10 +01:00
Mohsen Shamohamadi
d6f96a6c17 Add support for Persian language 2021-02-07 17:33:58 +03:30
Alex Tselegidis
0b5938471e The availabilities API controller must use the Availability library (this change will also fix the PHP error, when processing a service with multiple attendants) (#990) 2021-01-27 13:40:01 +01:00
Alex Tselegidis
120421b3af Replaced the generation of the appointment hash with the use of CodeIgniter's random_string method, in order to avoid collisions (#986). 2021-01-21 14:10:13 +01:00
Alex Tselegidis
7c9137f69d Make sure the selected hour is checked before selecting a provider on behalf of the customer, if he selected the any-provider option (#982). 2021-01-20 15:21:59 +01:00
Alex Tselegidis
7718b32cfb Removed some breaks from the default company working plan 2021-01-08 12:36:50 +02:00
Alex Tselegidis
2c67f7ce26 Correctly check for the assigned providers when notifying secretaries (#966). 2021-01-08 12:07:08 +02:00
Bevan Kay
edace7b002 Add ability to sync all-day Google Calendar Events 2021-01-07 16:10:47 +11:00
Alex Tselegidis
5d73fafc31 Release v1.4.1 2020-12-17 16:54:58 +02:00
Alex Tselegidis
5a52bde05a Additional check for the provided user props via the API 2020-12-17 16:49:04 +02:00
Alex Tselegidis
cf7bad9f19 Always display events in the provider's timezone in the backend calendar pages 2020-12-14 20:41:21 +02:00
Alex Tselegidis
5512731c41 Added customer data in the book success page 2020-12-14 20:40:56 +02:00
Alex Tselegidis
5df1bd4902 Made the timezone and language fields required, in the backend customers page 2020-12-14 20:40:10 +02:00
Alex Tselegidis
b7ff6cbc16 Include the moment timezone support file in backend pages 2020-12-14 20:38:34 +02:00
Alex Tselegidis
17e1f77a69 Changed the class name for consistency 2020-12-14 20:37:30 +02:00
Alex Tselegidis
bae970d257 Sync appointment with customer's Google Calendar in the book success page needs the correct timezone 2020-12-14 20:37:08 +02:00
Alex Tselegidis
f77ceeff84 Corrected click event behavior of the captcha refresh button 2020-12-14 10:48:36 +02:00
Alex Tselegidis
0d5f673ecf User timezone must not be empied by default as it is required. 2020-12-14 09:53:16 +02:00
Alex Tselegidis
731fb52ab4 Display confirmation modal when disabling a connected Google Calendar Sync (#955). 2020-12-12 14:22:25 +02:00
Alex Tselegidis
2dc5439b5d The password must be provided when creating a new user (#954) 2020-12-11 21:18:33 +02:00
Alex Tselegidis
36def8c52c Corrections in the API endpoints (#950) 2020-12-11 21:16:49 +02:00
Alex Tselegidis
3381b998a1 Check for other services when calculating multiple attendants number availability (#948). 2020-12-11 12:44:29 +02:00
Alex Tselegidis
7bf1d536f3 Updated the facebook URL in the about page. 2020-12-11 09:55:54 +02:00
Alex Tselegidis
ae3e0b1dcb Google Calendar sync must not break when syncing all day events (#945). 2020-12-10 11:31:59 +02:00
Alex Tselegidis
9133aeedd6 Applied Captcha fixes in the booking page 2020-12-09 21:28:26 +02:00
Alex Tselegidis
29a0fadf32 Release v1.4.0 2020-12-09 16:16:03 +02:00
Alex Tselegidis
bde91f5a14 Ensure that multiple attendant services can be modified with proper availability. 2020-12-09 15:32:39 +02:00
Alex Tselegidis
75905752f7 Adding missing parent constructor call in Privacy.php controller 2020-12-09 14:55:27 +02:00
Alex Tselegidis
39d4f3185e Removed [AJAX] string from controller comments. 2020-12-09 14:46:27 +02:00
Alex Tselegidis
b87be634b4 Applied same default data for both console and UI installation 2020-12-09 14:45:55 +02:00
Alex Tselegidis
4252bc8d0b Corrected the modal header 2020-12-09 14:29:02 +02:00
Alex Tselegidis
8a68e97f94 Reformatted code files 2020-12-09 14:17:45 +02:00
Alex Tselegidis
cc44f3e0c6 Corrected timezone support when syncing events with Google Calendar 2020-12-09 14:07:14 +02:00
Alex Tselegidis
022644b59e Corrected method call argument 2020-12-09 14:07:01 +02:00
Alex Tselegidis
6fe10a919b Updated the cache bust token 2020-12-08 15:25:14 +02:00
Alex Tselegidis
6e2b649955 Changed the default encryption key value 2020-12-08 15:25:02 +02:00
Alex Tselegidis
ee1aa81b6e Typo 2020-12-08 14:49:17 +02:00
Alex Tselegidis
22ac631995 Updated copyright information in backend 2020-12-08 14:16:42 +02:00
Alex Tselegidis
e92902f332 Backend users and services page would register the tab content events again and again 2020-12-08 13:23:37 +02:00
Alex Tselegidis
0aa41d0927 Corrected config set for language in parent controller 2020-12-08 13:22:46 +02:00
Alex Tselegidis
0631dbadf9 Fixed the validate_username model method. 2020-12-08 11:00:31 +02:00
Alex Tselegidis
9655feca6c Corrected issue with table view and duplicate appointments 2020-12-08 10:17:24 +02:00
Alex Tselegidis
54c4852cd7 Consistently use solid style of fontawesome 2020-12-08 00:10:49 +02:00
Alex Tselegidis
9b2a892b12 Removed blog link 2020-12-07 23:09:28 +02:00
Alex Tselegidis
228235fa26 Corrected argument order 2020-12-07 22:56:37 +02:00
Alex Tselegidis
40cf6cab40 Renamed variable 2020-12-07 22:55:31 +02:00
Alex Tselegidis
90c8ca157d Updated greek translations 2020-12-07 22:55:06 +02:00
Alex Tselegidis
c400366cd1 Modify default past and future dates (migration) 2020-12-07 22:54:52 +02:00
Alex Tselegidis
df8417a8cc Minor refactoring to helper files 2020-12-05 11:55:20 +02:00
Alex Tselegidis
e084ee913f Moved all the loader commands to the constructors 2020-12-05 11:55:09 +02:00
Alex Tselegidis
e31aec1ab5 Pass the manage_mode parameter to notifications and google libraries 2020-12-05 11:46:05 +02:00
Alex Tselegidis
843a476d0b The get_value method check the existence of a property with array_key_exists 2020-12-05 11:43:38 +02:00
Alex Tselegidis
9c3d253456 Code enhancements in the model classes 2020-12-05 11:38:57 +02:00
Alex Tselegidis
14017a49f5 Renamed the partial directory 2020-12-05 11:16:07 +02:00
Alex Tselegidis
033719e9b4 Renamed variables in API controllers 2020-12-05 11:14:13 +02:00
Alex Tselegidis
3dca937728 Improved condition checks in the API controller classes 2020-12-05 11:09:25 +02:00
Alex Tselegidis
93c2eb190f Added a help command in the console 2020-12-05 11:03:12 +02:00
Alex Tselegidis
3f43d2f768 Added new console command for created data backups. 2020-12-04 14:28:18 +02:00
Alex Tselegidis
8c8160897a Added more CI classes in the core props block 2020-12-04 12:58:31 +02:00
Alex Tselegidis
76379ede44 Added a seed and installation command. 2020-12-04 12:49:57 +02:00
Alex Tselegidis
8171d18fd4 Updated code style in API_V1_Controller.php 2020-12-04 12:36:27 +02:00
Alex Tselegidis
fc362b340b Added fresh option to migrations 2020-12-02 22:21:35 +02:00
Alex Tselegidis
9cde499f9a Use the shorthand method for config items 2020-12-02 22:12:54 +02:00
Alex Tselegidis
77d8d4e5ab Use the shorthand method for translations 2020-12-02 22:11:07 +02:00
Alex Tselegidis
238c480837 Consistently use $CI to reference the framework instance 2020-12-02 22:10:11 +02:00
Alex Tselegidis
d465e05652 Render emails with the framework 2020-12-02 22:08:49 +02:00
Alex Tselegidis
1571a01f1d Update page UI fixes 2020-12-02 21:58:32 +02:00
Alex Tselegidis
e7b4aeedab Automatically load the translations 2020-12-02 20:04:06 +02:00
Alex Tselegidis
84ab6702b3 Autoload the session library 2020-12-02 20:03:55 +02:00
Alex Tselegidis
c0a6370544 Snake case variable name 2020-12-02 19:50:17 +02:00
Alex Tselegidis
190e2d792a Updated the swedish translation (thanks to Thomas Dilts) 2020-12-01 09:39:02 +02:00
Alex Tselegidis
e8655066fd Added scope to the Google Calendar connection flow to enforce the user consent screen. 2020-11-30 21:34:12 +02:00
Alex Tselegidis
f6ee08608a Initialize unavailability array 2020-11-21 23:09:27 +02:00
Alex Tselegidis
d5d4893840 Corrected method calls in when appointment gets saved from the backend 2020-11-21 23:08:07 +02:00
Alex Tselegidis
fe9d385a72 Fallback value for working days that are disabled. 2020-11-21 22:21:37 +02:00
Alex Tselegidis
8c836bf10c Multiple attendant number generation must take into consideration the working plan exceptions 2020-11-21 22:16:53 +02:00
Alex Tselegidis
9e71255cae Merge branch 'develop' 2020-11-21 22:05:29 +02:00
Alex Tselegidis
d6a5373264 Less data loaded for providers in book success. 2020-11-21 22:02:55 +02:00
Alex Tselegidis
da187c8b02 Redirect to appointments instead of appointments/index 2020-11-21 22:02:44 +02:00
giladx
15e44483d3 hebrew language translation 2020-11-18 18:35:06 +02:00
giladx
7d36eeaef8 added hebrew language 2020-11-18 17:43:55 +02:00
giladx
3e581a1de9 added hebrew language 2020-11-18 17:36:22 +02:00
Alex Tselegidis
87fdb2ae5c The EA_Migration class is not part of the core and cannot be extended directly. 2020-11-16 13:25:54 +02:00
Alex Tselegidis
46d604f5e6 Applied consistent code style to the engine class files. 2020-11-16 11:55:34 +02:00
Alex Tselegidis
084aed9e23 Notifications go out on the recipient's timezone (#914) 2020-11-16 11:55:33 +02:00
Alex Tselegidis
af5ddfaac4 Only admins can modify working plan exceptions at the moment 2020-11-16 11:09:48 +02:00
Alex Tselegidis
6f8e971673 Ensure working plan exceptions will not be NULL before being used (#926). 2020-11-16 10:43:25 +02:00
Alex Tselegidis
a48324be08 Minor changes to the model classes 2020-11-16 10:41:04 +02:00
Alex Tselegidis
75a5addbc2 Grouped the property tag into parent core classes so that it does not need to be repeated. 2020-11-16 10:29:36 +02:00
Alex Tselegidis
976cabb2c4 Updated URLs in the file comments 2020-11-16 10:16:00 +02:00
Alex Tselegidis
6e66eb4fd8 Consistent module naming throughout the app 2020-11-16 10:16:00 +02:00
Alex Tselegidis
501d359ee1
Merge pull request #935 from 0xalen/develop 
Spanish translations
 2020-11-16 09:05:18 +01:00
Alejandro
a9d7b107e0
Merge pull request #1 from 0xalen/working-plans-spanish-translations 
Working plans Spanish translations
 2020-11-14 20:59:58 -03:00
Alejandro
46da3d1fa8
Update translations_lang.php 
Add remaining translations about working plans.
Special mention about secretaries. In Spanish it might be worth to use 'Secretario/as' as a reference to both sexes to avoid issues with the users.
 2020-11-14 20:55:15 -03:00
Alex Tselegidis
e8556e0339 jQuery needs to be defined before being used in the login page. 2020-11-12 14:55:03 +02:00
Alex Tselegidis
39c8ec9068 Groupped load commands in model constructor methods 2020-11-12 14:51:10 +02:00
Alex Tselegidis
8842e2d918 Update session date based on the current user settings page updates 2020-11-12 14:47:15 +02:00
Alex Tselegidis
0c20363b8b Correction in the Appointments check datetime availability method 2020-11-12 14:46:51 +02:00
Alex Tselegidis
d13df8f8e1 Corrected condition fallback value in Categories.php API controller 2020-11-12 14:16:23 +02:00
Alex Tselegidis
25fdd5636d Corrected wrong parameters order. 2020-11-12 14:15:38 +02:00
Alex Tselegidis
cc6b18022c Ensure that non working days are not processed. 2020-11-12 14:15:12 +02:00
Alex Tselegidis
69daed1d4b
Merge pull request #918 from mokkin/patch-2 
German translation correction
 2020-10-27 11:31:29 +02:00
Alex Tselegidis
0e7abeac1c
Merge pull request #916 from mokkin/patch-1 
Updated german translations for v1.4.0
 2020-10-27 11:31:05 +02:00
Alex Tselegidis
39614fc418 Corrected the column class of the time selection container 2020-10-27 11:30:03 +02:00
Alex Tselegidis
632b943392 Use the container class in installation.php 2020-10-27 11:29:51 +02:00
mokkin
8924e305e6
correct translation 2020-10-24 22:50:52 +02:00
mokkin
90012dffe1
completed german translations 2020-10-24 22:22:35 +02:00
Alex Tselegidis
e3089aeca9 Release v1.4.0-beta.1 2020-10-22 12:50:47 +03:00
Alex Tselegidis
a85ec4c275 Removed old image files and updated the content and styling of the isntallation page 2020-10-22 12:49:37 +03:00
Alex Tselegidis
9604aa4ef9 Replaced qtip with tippy.js 2020-10-22 12:29:09 +03:00
Alex Tselegidis
67dc42b2d8 Update in the backend header brand subtitle 2020-10-22 12:10:36 +03:00