ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity
2800 commits 2 branches 38 tags 38 MiB
Commit graph

430 commits

Author SHA1 Message Date
Alex Tselegidis
7409b17a03 Export common admin page module functions. 2022-01-10 09:07:48 +01:00
Alex Tselegidis
41f25026de Convert the secretaries page to the new js module structure. 2022-01-07 09:44:51 +01:00
Alex Tselegidis
30418468e8 Convert the admins page to the new js module structure. 2022-01-07 09:29:04 +01:00
Alex Tselegidis
e0c66cd066 Rename the "display" filter parameter to "show" for consistency. 2022-01-07 09:07:07 +01:00
Alex Tselegidis
bd3b55c2f9 Replace var with const/let in customers module 2022-01-07 09:02:30 +01:00
Alex Tselegidis
62357dfc36 Update customers module comment 2022-01-07 08:59:03 +01:00
Alex Tselegidis
547e681a22 Remove unused users-page scripts 2022-01-07 08:57:20 +01:00
Alex Tselegidis
7f4756a6df Correct input filter component and remove the clear button for other pages 2022-01-07 08:56:46 +01:00
Alex Tselegidis
7b54377f92 Correct input filter component and remove the clear button 2022-01-07 08:47:19 +01:00
Alex Tselegidis
273a218ba8 Replace GeneralFunctions references 2022-01-07 08:42:43 +01:00
Alex Tselegidis
1daee776e1 Add date utility script module 2022-01-07 08:42:07 +01:00
Alex Tselegidis
ac630a1019 Ported the GeneralFunctions.displayMessageBox function to App.Utils.Message.show 2022-01-06 09:54:30 +01:00
Alex Tselegidis
d585dd550e The customers http client now has a save helper method. 2022-01-06 09:53:37 +01:00
Alex Tselegidis
00c3aebef0 Refactored the customers helper JS file so that it becomes a standalone module. 2022-01-06 09:53:16 +01:00
Alex Tselegidis
def2668ede Removed the backend_customers.js file as it is no longer needed 2022-01-06 09:52:52 +01:00
Alex Tselegidis
ae342f1671 Refactored the legal settings page functionality and structure 2022-01-05 09:08:39 +01:00
Alex Tselegidis
afad7920eb The booking page will render based on the selected displayed/required fields. 2021-12-20 09:38:37 +01:00
Alex Tselegidis
80e77ad8a0 Removed unnecessary files 2021-12-20 09:16:57 +01:00
Alex Tselegidis
4eec5fbe46 Refactored the booking settings page functionality and structure 2021-12-20 09:16:44 +01:00
Alex Tselegidis
c40f2c7004 Corrected serialized/deserialize function names 2021-12-20 08:47:57 +01:00
Alex Tselegidis
4c7aa9b3b0 Removed export command 2021-12-20 07:11:15 +01:00
Alex Tselegidis
6017abea45 Refactored the business settings page functionality and structure 2021-12-18 21:36:25 +01:00
Alex Tselegidis
f14643725d Converted normal functions to arrow functions 2021-12-18 21:14:10 +01:00
Alex Tselegidis
2342e0d3d0 Fixes on the general settings page 2021-12-18 21:04:59 +01:00
Alex Tselegidis
0f44d37ef3 Removed unnecessary script 2021-12-18 21:00:24 +01:00
Alex Tselegidis
42ff670928 Refactored the general settings page functionality and structure 2021-12-18 20:53:59 +01:00
Alex Tselegidis
e0874149b4 Removed obsolete JS files 2021-12-18 19:02:56 +01:00
Alex Tselegidis
e8011afb9a Corrected the username validation 2021-12-18 19:02:35 +01:00
Alex Tselegidis
f4146d58e9 Added validation to the account page 2021-12-18 18:56:08 +01:00
Alex Tselegidis
a3282febc9 Added new callback to the account controller to validate usernames 2021-12-18 18:55:58 +01:00
Alex Tselegidis
7b71f8a9a1 Created new validation utility file 2021-12-18 18:55:01 +01:00
Alex Tselegidis
be7e2ddf76 Replace jQuery.Deferred in jsdoc as it is not recognized as an object 2021-12-18 18:34:12 +01:00
Alex Tselegidis
7e6aaab45b Removed the window prefix as the App instance is already defined 2021-12-18 18:26:02 +01:00
Alex Tselegidis
c91bf6bf51 Use the App.Vars prop 2021-12-18 18:25:24 +01:00
Alex Tselegidis
c53cd000d8 Refactored the account page functionality and structure 2021-12-18 18:25:03 +01:00
Alex Tselegidis
a090b2eba9 Updated the file banner info 2021-12-18 17:44:07 +01:00
Alex Tselegidis
28c55ba09c Added the vars prop to the global app object 2021-12-17 10:50:53 +01:00
Alex Tselegidis
c49f141bbb Moved the booking confirmation and cancellation code out of the booking controller 2021-12-16 08:37:55 +01:00
Alex Tselegidis
568ff9be2e Renamed the service category resource to just category 2021-12-15 08:00:48 +01:00
Alex Tselegidis
9c44b8644f Renamed csrfToken var to csrf_token for consistency 2021-12-14 07:29:51 +01:00
Alex Tselegidis
17bf3902cd Added the HTTP JS helper file 2021-12-14 07:25:46 +01:00
Alex Tselegidis
f0f0a029ab Added the URL JS helper file 2021-12-14 07:20:58 +01:00
Alex Tselegidis
dd89afbfd7 Added code to the http client files 2021-12-14 07:14:11 +01:00
Alex Tselegidis
d0ad54ce49 Replaced EALang with the global App.Lang object 2021-12-13 07:52:09 +01:00
Alex Tselegidis
49ec1d1cae Created new JS http client files 2021-12-10 22:08:52 +01:00
Alex Tselegidis
423edc7340 Created new layout JS files. 2021-12-10 22:02:29 +01:00
Alex Tselegidis
450bc49932 Moved setting JS files to the pages directory. 2021-12-10 22:00:26 +01:00
Alex Tselegidis
bd412eba8e Refactored the installation page functionality 2021-12-10 09:12:08 +01:00
Alex Tselegidis
037c3037e6 The last parameter is optional 2021-12-10 09:12:08 +01:00
Alex Tselegidis
6ab32781ad Moved the recovery functionality into its own controller and files 2021-12-10 08:41:16 +01:00
Alex Tselegidis
5c3336f214 Updated the HTTP URL of the account settings page js 2021-12-10 08:40:53 +01:00
Alex Tselegidis
3607574e04 Updated the HTTP URL of the login page js 2021-12-10 08:39:42 +01:00
Alex Tselegidis
4ad23bed88 Removed unnecessary quotes 2021-12-10 08:31:00 +01:00
Alex Tselegidis
523db7e5e3 Moved the login functionality into its own controller and files 2021-12-07 10:53:59 +01:00
Alex Tselegidis
f1849e3a16 Restructured the view/js/css files (flatter file structure) 2021-12-06 09:00:02 +01:00
Alex Tselegidis
e034404937 Added main app JS file 2021-11-29 09:01:02 +01:00
Alex Tselegidis
617ada7641 Major assets restructuring (for better scalability). 2021-11-29 08:55:29 +01:00
Alex Tselegidis
0c5c1347aa Date handling fixes for JS files 2021-11-25 08:40:48 +01:00
Alex Tselegidis
a76cf2dedb Date handling fixes for the default view and use the calendar controller instead of the Backend API 2021-11-24 09:24:10 +01:00
Alex Tselegidis
965ac2fc96 Date handling fixes for the unavailability modal 2021-11-24 09:23:36 +01:00
Alex Tselegidis
fca813e2fe Use the calendar controller instead of the backend API 2021-11-24 09:23:22 +01:00
Alex Tselegidis
b8cdf1c3ff The javascript code must use moment instead of datejs 2021-11-24 08:34:26 +01:00
Alex Tselegidis
1fca948e55 Replaced "has-error" use with "is-invalid" 2021-11-23 10:10:09 +01:00
Alex Tselegidis
3808185ac9 Replaced the use of the "hidden" class with the "hidden" attribute 2021-11-23 10:06:13 +01:00
Alex Tselegidis
01fe98602f Further utility class fixes 2021-11-23 08:43:40 +01:00
Alex Tselegidis
56a7ac1cd9 Replaced btn-block class occurrences with w-100 2021-11-23 08:33:43 +01:00
alextselegidis
d6debb40f5 Removed old settings files 2021-11-22 08:09:56 +01:00
alextselegidis
a622f2f295 Ported the current user settings functionality to a new standalone page 2021-11-22 08:09:56 +01:00
alextselegidis
35a05de1f0 Ported the legal contents settings functionality to a new standalone page 2021-11-22 08:09:56 +01:00
alextselegidis
fc48db0ea4 Ported the client form settings functionality to a new standalone page 2021-11-22 08:09:56 +01:00
alextselegidis
d00a8956d7 Renamed the helper and removed code that does not apply to the general settings page any more 2021-11-18 08:58:19 +01:00
alextselegidis
2d1fb357c8 Ported the business logic settings functionality to a new standalone page 2021-11-18 08:49:23 +01:00
alextselegidis
753237d003 Ported the general settings functionality to a new standalone page 2021-11-18 07:53:41 +01:00
alextselegidis
7a64ced5c9 All the AJAX URLs now point to the new Booking controller 2021-11-18 07:35:14 +01:00
alextselegidis
fec42278c8 Created a new customers resource controller 2021-11-18 06:34:07 +01:00
alextselegidis
7a3aa38622 Created a new secretaries resource controller 2021-11-18 06:23:21 +01:00
alextselegidis
d6b294a12b Created a new admins resource controller 2021-11-18 06:11:18 +01:00
alextselegidis
4bbcb9fff8 Created a new providers resource controller 2021-11-18 06:08:36 +01:00
alextselegidis
8682fc886b Removed the services part from the service categories page 2021-11-18 05:35:56 +01:00
alextselegidis
2a599f11b8 Removed the service categories part from the services page 2021-11-18 05:32:46 +01:00
alextselegidis
aadac6a060 Created a new service categories resource controller 2021-11-18 05:23:54 +01:00
alextselegidis
8dd509d4dc Created a new services resource controller 2021-11-18 05:21:30 +01:00
alextselegidis
9afe90f831 Correctly display long error messages within the modal 2021-11-17 09:23:21 +01:00
alextselegidis
cd9a92bed9 Removed the polyfill scripts as it is no longer needed. 2021-11-09 08:11:33 +01:00
Alex Tselegidis
3896892bc0 Formatted the JS and CSS files with prettier 2021-11-06 17:38:37 +01:00
Alex Tselegidis
a20f2e9e33 Corrected the login HTTP callback 2021-11-06 16:51:36 +01:00
Alex Tselegidis
8e0d8d7c16 Changed the response content of the username validation method 2021-10-28 13:32:04 +02:00
Alex Tselegidis
7c082689ea More formatting changes 2021-10-28 13:30:39 +02:00
Thomas Saedt
9671def4ea Merge branch 'develop' into 1081_hide_data_fields 2021-10-20 22:12:47 +02:00
Alex Tselegidis
8d4d063afa Prepend the "any-provider" option to the booking page so that it is the first option displayed. 2021-10-18 12:19:13 +02:00
Alex Tselegidis
6fa2451a08 Added missing validation call in system settings 2021-10-04 09:27:32 +02:00
Alex Tselegidis
ea4295e1ad Replaced the email validation regex with a better one 2021-10-04 09:27:08 +02:00
Alex Tselegidis
566ca1c79e Added file comment-banner 2021-10-04 09:26:48 +02:00
Alex Tselegidis
8eec2339cf The backend calendar must display the modified appointment date, when using the appointment link of the confirmation email (#1112). 2021-08-24 16:03:45 +03:00
Alex Tselegidis
5dd8540577 Use the AM/PM postfix as lowercase everywhere for consistency. 2021-07-19 17:44:31 +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
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
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
55a4665c7d Select the any-provider option by default. 2021-06-14 10:27:37 +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
1bcbf9f71b [1081] Made show booking form field settings functional 2021-05-30 13:27:39 +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
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
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
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
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
78ab4ac3d2 Removed unnecessary condition 2020-12-15 10:49:16 +02:00
Alex Tselegidis
442ba83296 Display the please-select-time warning at the top of the available hours 2020-12-14 20:40:32 +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
1a1deb28c2 Use the native JSON.parse method instead of the jQuery variation 2020-12-14 20:38:57 +02:00
Alex Tselegidis
8fb111190b Use the native JSON.parse method instead of the jQuery variation 2020-12-14 20:38:17 +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
30381b5c86 Removed the onDayClick callback in table view as it is not needed. 2020-12-12 15:31:08 +02:00
Alex Tselegidis
0da88a7729 Check provided date 2020-12-12 15:11:33 +02:00
Alex Tselegidis
ce40aa342b Automatically update the non working plan when changed in backend calendar. 2020-12-12 14:54:41 +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
de9e0542ea Remove now indicator as it does not support custom timezones (#953) 2020-12-11 21:15:25 +02:00
Alex Tselegidis
9409633a5d Corrected javascript typo with unavailability events (#946). 2020-12-10 11:31:19 +02:00
Alex Tselegidis
9133aeedd6 Applied Captcha fixes in the booking page 2020-12-09 21:28:26 +02:00
Alex Tselegidis
53a6a8c3a8 Debounce keyup events when searching for existing customers 2020-12-09 16:00:15 +02:00
Alex Tselegidis
b794cb6e74 Use the native JSON parse method 2020-12-09 15:59:59 +02:00
Alex Tselegidis
b45fd3acd6 Default value for the working plan exceptions in table view 2020-12-09 15:59:46 +02:00
Alex Tselegidis
8a68e97f94 Reformatted code files 2020-12-09 14:17:45 +02:00
Alex Tselegidis
2b5ee0426f JS fixes in the backend calendar default view 2020-12-09 14:06:47 +02:00
Alex Tselegidis
b291a2bb24 Improved event selection for both default and table calendar views 2020-12-08 14:16:58 +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
9655feca6c Corrected issue with table view and duplicate appointments 2020-12-08 10:17:24 +02:00
Alex Tselegidis
8f2487865f Changed cookie banner button background color 2020-12-08 09:59:17 +02:00
Alex Tselegidis
23ac39797b Default values in the appointment modal, when inserting a new appointment from the table view 2020-12-08 09:57:22 +02:00
Alex Tselegidis
3944309b0c Execut the revertFunc directly 2020-12-08 09:42:28 +02:00
Alex Tselegidis
0e9758372d Added now indication and changed snap duration 2020-12-08 09:36:46 +02:00
Alex Tselegidis
bff87eb4aa Automatically reload the calendar every minute. 2020-12-08 00:11:01 +02:00
Alex Tselegidis
54c4852cd7 Consistently use solid style of fontawesome 2020-12-08 00:10:49 +02:00
Alex Tselegidis
9b24ce1e57 Corrected issue with full calendar title 2020-12-05 11:07:22 +02:00
Alex Tselegidis
32e2b2843b Default values when creating a service 2020-12-05 11:05:20 +02:00
Alex Tselegidis
78a54ef0bb Type casting for if condition 2020-12-04 14:42:31 +02:00
Alex Tselegidis
88028d5770 Ensure DOM is loaded before binding the global AJAX error handler. 2020-12-02 20:08:28 +02:00
Alex Tselegidis
2ccc236bc2 Global AJAX error handling 2020-12-02 19:57:49 +02:00
Alex Tselegidis
bbaac53308 Fixed issue with translation breaking the calendar page (#931). 2020-11-16 11:09:31 +02:00
Alex Tselegidis
46804fab7b Do not make a request to the server if there's no service or provider selection 2020-11-16 10:16:48 +02:00
Alex Tselegidis
b3fbf60e29 Fixed issue with table view while being logged in as a provider (#928). 2020-11-16 10:16:00 +02:00
Alex Tselegidis
35f8553300 Added missing comma to selector. 2020-11-12 14:15:52 +02:00
Alex Tselegidis
ce4dc67c91 Corrected problem with disabled service fields during service edits 2020-10-27 11:49:48 +02:00
Alex Tselegidis
9604aa4ef9 Replaced qtip with tippy.js 2020-10-22 12:29:09 +03:00
Alex Tselegidis
4203bf5851 Working plan exception improvements for the table view 2020-10-22 12:12:27 +03:00
Alex Tselegidis
5fa8ee4255 Added support for working plan exceptions in the table view page 2020-10-22 12:01:33 +03:00
Alex Tselegidis
1067a92a18 Renamed further "unavailabilities" occurrences to "unavailability events" 2020-10-21 21:44:35 +03:00
Alex Tselegidis
e0dea50ee4 Renamed the unavailabilities to unavailability events 2020-10-21 21:36:37 +03:00
Alex Tselegidis
69a0c2a48f Register the non-timezoned time in the database. 2020-10-21 21:35:40 +03:00
Alex Tselegidis
0e6fdebe0f Completed the working plan exceptions feature. 2020-10-20 16:05:00 +03:00
Alex Tselegidis
0324a3e464 Removed the unnecessary modal-close event handler 2020-10-20 16:04:25 +03:00
Alex Tselegidis
5e0ef2acc1 Corrected method name typo 2020-10-20 16:04:25 +03:00
Alex Tselegidis
45c8a82d3f Add some margin between the icon and the text of the edit popover 2020-10-20 16:04:25 +03:00
Alex Tselegidis
06956e82d0 Replaced the btn light class with btn outline secondary 2020-09-28 15:24:29 +03:00
Alex Tselegidis
cab9aed12f Styling upgrades for the backend calendar page 2020-09-28 15:17:47 +03:00
Alex Tselegidis
d9985643f3 Additional styling for the frontend pages. 2020-09-28 14:42:32 +03:00
Alex Tselegidis
068a3995b0 Further fixes on the google synyc activation (#890). 2020-09-24 10:26:29 +03:00
Alex Tselegidis
069509c8da Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements 
# Conflicts:
#	application/views/backend/calendar.php
#	application/views/backend/settings.php
 2020-09-23 15:13:58 +03:00
Alex Tselegidis
a3dfb91550 Improvements in the user language storage feature. 2020-09-23 13:48:07 +03:00
Alex Tselegidis
e70e39e3f7 The language selection popup will disappear if the users clicks anywhere on the screen (#815). 2020-09-23 13:40:49 +03:00
Alex Tselegidis
7bbe85b88a
Merge pull request #817 from popod/save-customer-language 
Save customer language to the database
 2020-09-23 13:16:25 +03:00
Alex Tselegidis
30eb95461a Improvements and fixes on the custom availability feature 2020-09-23 12:24:42 +03:00
Sébastien
9d1dda3806 Fix appointment date wrongly updated to current date when the modal is open from the /backend/index/<appointment hash> url 2020-09-09 15:24:28 +02:00
Alex Tselegidis
be85f46158 Restructured the customer's appointments column and added direct link to editing an appointment. 2020-09-08 10:42:58 +03:00
Alex Tselegidis
34e4d6ea13 Refactored the backend resetForm and validation methods for consistency between pages. 2020-09-08 09:57:07 +03:00
Alex Tselegidis
64cdbfb445 Applied the switcher widget for the settings user notifications 2020-09-07 14:51:52 +03:00
Alex Tselegidis
69e39b9062 Corrected disabled state on users page. 2020-09-07 14:33:02 +03:00
Alex Tselegidis
6188df7ae5 Replaced the custom tab widget in backend providers with bootstrap based navigation 2020-09-07 14:17:01 +03:00
Alex Tselegidis
de498ab5c2 Styling for the table view calendar header row. 2020-09-07 13:18:25 +03:00
Alex Tselegidis
18fa137336 Styling corrections to the popover buttons 2020-09-07 13:04:07 +03:00
Alex Tselegidis
af270e8fe2 Use the short "phone" for the appointment popover 2020-09-07 13:03:59 +03:00
Alex Tselegidis
2f6699f655 All buttons have their icon. 2020-09-07 12:21:16 +03:00
Alex Tselegidis
185686d194 Replaced custom toggle buttons with bootstrap switcher component. 2020-09-07 11:36:36 +03:00
Alex Tselegidis
769668c828 Move the call to action button of modals to the right 2020-09-07 11:15:01 +03:00
Alex Tselegidis
5031b66bd2 Renamed the id attribute from "message_box" to "message-box" to keep things consistent. 2020-09-07 11:08:18 +03:00
Alex Tselegidis
b0b8620379 The delete reason textarea has the "form-control" class. 2020-09-07 11:07:24 +03:00
Alex Tselegidis
a1c10fc2d3 Replace custom event handler methods with the use of "on". 2020-09-07 10:53:39 +03:00
Alex Tselegidis
6c8fea4ad8 Register modal events before using them, e.g. when provider edits an existing appointment via link (#839) 2020-09-07 10:51:46 +03:00
Alex Tselegidis
63b9653bb2 Added bootstrap 4 classes to the date field of the table calendar view in backend. 2020-09-03 14:14:56 +03:00
Alex Tselegidis
159225a7c7 Changed the display of the availability in the booking page for a better user experience (buttons are used now). 2020-09-03 14:14:34 +03:00
Alex Tselegidis
935c36be60 Replaced the well element with the card (bootstrap). 2020-08-31 18:33:36 +03:00
Alex Tselegidis
b6dbf1cfd8 Corrected the markup for the load more button. 2020-08-31 18:33:15 +03:00
Alex Tselegidis
76755a286d Properly set the selected date when editing an existing appointment in the booking page. 2020-08-31 17:35:27 +03:00
Alex Tselegidis
7a496f0166 Added additional styling for the appointment cancellation and customer data removal modals. 2020-08-31 17:26:28 +03:00
Alex Tselegidis
8f618c3339 Miscellaneous fixes on view files, required after merging the bootstrap 4 codebase 2020-08-31 13:23:10 +03:00
Alex Tselegidis
6d6dc9b19c
Merge pull request #870 from popod/fix-translations 
Fix the undo translation
 2020-08-20 17:49:26 +02:00
Alex Tselegidis
4cc4437dad Merge branch 'bootstrap-4-and-fontawesome' of https://github.com/janinavelasco9/easyappointments into janinavelasco9-bootstrap-4-and-fontawesome 
# Conflicts:
#	application/views/backend/calendar.php
#	assets/js/backend_calendar_extra_periods_modal.js
#	assets/js/backend_customers_helper.js
 2020-08-15 18:41:14 +03:00
Alex Tselegidis
10bc62de9f Merge branch 'develop' of github.com:alextselegidis/easyappointments into develop 2020-08-15 16:58:05 +03:00
Alex Tselegidis
f69db8fd93
Merge pull request #755 from popod/fix-typo 
Fix some minor errors
 2020-08-15 16:56:32 +03:00
Alex Tselegidis
ac44edf43f
Merge pull request #756 from popod/remove-modal-timeout 
Remove timeout before closing the extra periods modal on success.
 2020-08-15 16:50:04 +03:00
Alex Tselegidis
143624b7d8 Close popover when inserting new appointment (#773). 2020-08-15 16:33:26 +03:00
Alex Tselegidis
ad509e8f22 Corrected the jsdoc 2020-08-15 16:27:20 +03:00
Alex Tselegidis
fc392e3ccf
Merge pull request #777 from popod/fix-dropdown-disable 
Fix disabled bug with insert dropdown in backend.
 2020-08-15 16:08:45 +03:00