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

1955 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
dependabot[bot]
7e57d2de90
Bump phpseclib/phpseclib from 2.0.29 to 2.0.31 
Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.29 to 2.0.31.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.29...2.0.31)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-07 23:05:17 +00: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
d86eb72d87 Merge branch 'patch-2' of https://github.com/sh-dv/easyappointments into develop 2021-04-07 10:06:34 +02:00
Alex Tselegidis
1a50b2e2e1 Merge branch 'patch-1' of https://github.com/sh-dv/easyappointments into develop 2021-04-07 10:04:08 +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
Alex Tselegidis
96b694ff61
Merge pull request #1033 from alextselegidis/dependabot/npm_and_yarn/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2
 2021-04-07 09:46:50 +02:00
dependabot[bot]
278d5ccba3
Bump y18n from 3.2.1 to 3.2.2 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-31 17:08:35 +00: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
cbka
1994184a88
Update Email.php 
Adding debugging and option to chose wheter auth is TRUE or FALSE
 2021-03-27 19:38:42 +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
3bf718050d Improved the backend calendar rendering performance by reducing the number of calendar render cycles on each reload 2021-03-25 11:12:10 +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
sh-dv
d51ca87f1b
small fix for the display of the delete button in table view 
it will turn out the following class "mr-2 d-none" instead of "mr-2-d-none" which results displaying the delete button if -> GlobalVariables.user.privileges.appointments.delete = false
 2021-02-06 17:49:47 +00:00
Alex Tselegidis
2d3a6ef510 Corrected swagger file in the documentation. 2021-02-01 10:01:18 +01:00
Alex Tselegidis
ae993551aa Updated the minimum php version requirement to v7.3 (required by vendor packages that also support v8.0) (#993). 2021-01-28 11:57:27 +01:00
Alex Tselegidis
f5b2b3611e Updated dependencies and added PHP8 compatibility. 2021-01-28 11:37:23 +01:00
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
af350fc617 Make sure the randomly selected provider is really serving the selected service, when generating availability wit the "Any Provider" option in the frontend (#991). 2021-01-27 13:39:12 +01:00
sh-dv
9c99223cb3
Critical mistake resulting in wrong date 2021-01-25 15:02:04 +00:00
Alex Tselegidis
1700605b7b
Merge pull request #960 from alextselegidis/dependabot/npm_and_yarn/node-notifier-8.0.1 
Bump node-notifier from 5.4.3 to 8.0.1
 2021-01-21 14:13:23 +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
dependabot[bot]
67432e109a
Bump node-notifier from 5.4.3 to 8.0.1 
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 5.4.3 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v5.4.3...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-22 20:30:25 +00:00
Alex Tselegidis
2512159285 Merge branch 'develop' 2020-12-17 16:55:33 +02: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
bd6ab1c7fe Remove the codeigniter user guide from the build archive 2020-12-17 16:48:47 +02:00