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

2330 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Tselegidis
d09fbb0ad6 Make sure that saving the modifications of a single break does not cancel any pending break edits. #1046 2021-07-19 16:30:27 +03:00
Alex Tselegidis
23bcc2d468 Working plan exception - details pane shows incorrect details (#1011). 2021-07-19 16:21:14 +03:00
Alex Tselegidis
c885b27f7d Add support for line breaks when displaying the service description in the frontend (#1004). 2021-07-19 16:14:37 +03:00
Alex Tselegidis
5a039f2757 Missing Pacific (and potentially other) timezones (#980). 2021-07-19 16:07:26 +03:00
Alex Tselegidis
39cc1b5a0b Timezone/UX issue: Wrong day is selected when timezone differs by -1 day (#961). 2021-07-19 16:02:45 +03:00
Alex Tselegidis
cc6575d2d0 JavaScript RangeError on appointment change causing disabled calendar dates (#1092). 2021-07-19 15:52:05 +03:00
Alex Tselegidis
25b44063b4 Updated dependencies in the package-lock.json file. 2021-07-19 14:28:02 +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
588ba2785f Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/hosted-git-info-2.8.9' into develop 2021-07-19 14:17:42 +03:00
Alex Tselegidis
738c9c72bb Merge remote-tracking branch 'remotes/origin/dependabot/composer/phpseclib/phpseclib-2.0.31' into develop 2021-07-19 14:16:24 +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
aca2105302 Aligned the framework to the updated PHP8.0 compatible CodeIgniter version. 2021-07-19 14:03:18 +03:00
Alex Tselegidis
3c4e7923ce Removed duplicate row from the configuration file. 2021-07-19 13:42:29 +03:00
Alex Tselegidis
55a4665c7d Select the any-provider option by default. 2021-06-14 10:27:37 +02: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
Tthecreator
5cff20f4bf
Fix warnings given by npm start by incorrect var/let. 
Apply suggestions from @vitormattos.

Co-authored-by: Vitor Mattos <vitor@php.rio>
 2021-06-13 16:45:25 +00: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
dependabot[bot]
3845a3aeae
Bump hosted-git-info from 2.8.8 to 2.8.9 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-11 22:47:58 +00: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
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
Thomas S
261ffdeb9a [1038] Sender and return address set to pass spamfilters 2021-04-05 22:58:37 +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