-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Develop #1277
Open
redquantum
wants to merge
1,728
commits into
master
Choose a base branch
from
develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Develop #1277
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hello! Thanks for this PR! Let me check this and get back to you.
|
Administrator from Account page Company from General Settings page
js #retype-password to #password-confirm
If none of the above succeed, will return a default timezone of UTC. https://www.php.net/manual/en/function.date-default-timezone-get.php
Fix When login CI call sess_regenerate() but do not apply config 'sess_regenerate_destroy' & always create new file After this, a session folder have one file by user logged and clean old session files in storage/sessions folder To test : in application/config.php `$config['sess_time_to_update'] = 3;` see https://bobcares.com/blog/codeigniter-generating-too-many-sessions-files-resolved
Fix bad transtyped bool throw error on login session_regenerate_id(): Passing null to parameter #1 ($delete_old_session) of type bool is deprecated
Fix undisplayed appointments if not in this current month and if moved by D&D on prev/next month days view (displace OK), but after auto refresh, appointment disapear in view... After little fear, it exist in db :) Need to choose prev/next month (where is moved) to see it. see https://fullcalendar.io/docs/view-object
views/pages/(account|admins|providers|secretaries).php
# Conflicts: # application/language/arabic/translations_lang.php # application/language/bulgarian/translations_lang.php # application/language/catalan/translations_lang.php # application/language/chinese/translations_lang.php # application/language/croatian/translations_lang.php # application/language/czech/translations_lang.php # application/language/danish/translations_lang.php # application/language/dutch/translations_lang.php # application/language/english/translations_lang.php # application/language/estonian/translations_lang.php # application/language/finnish/translations_lang.php # application/language/french/translations_lang.php # application/language/german/translations_lang.php # application/language/greek/translations_lang.php # application/language/hebrew/translations_lang.php # application/language/hindi/translations_lang.php # application/language/hungarian/translations_lang.php # application/language/italian/translations_lang.php # application/language/japanese/translations_lang.php # application/language/luxembourgish/translations_lang.php # application/language/marathi/translations_lang.php # application/language/persian/translations_lang.php # application/language/polish/translations_lang.php # application/language/portuguese-br/translations_lang.php # application/language/portuguese/translations_lang.php # application/language/romanian/translations_lang.php # application/language/russian/translations_lang.php # application/language/serbian/translations_lang.php # application/language/slovak/translations_lang.php # application/language/spanish/translations_lang.php # application/language/swedish/translations_lang.php # application/language/thai/translations_lang.php # application/language/turkish/translations_lang.php # assets/js/components/appointments_modal.js # assets/js/pages/admins.js # assets/js/pages/customers.js # assets/js/pages/providers.js # assets/js/pages/secretaries.js
This was merged 17.4. 2024, but it was lost lost on merges on 11.5.2024.
Add missing ;
Update appointments_modal.js
Update booking.js
…e debug mode is active
Use CodeIgniter constant instead of a hardcoded path
Update Lithuanian localization
Fix German translation for about in translations_lang.php
(cherry picked from commit c0ee192)
add API calls for blocked periods
Optimize Google API dependencies by keeping only Google Calendar
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello Friend,
Can you add customer photo in new version.
Thank you