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

323 commits

Author SHA1 Message Date
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
Alex Tselegidis
733e9a119a Updated the code style of the API controllers 2020-10-21 21:49:05 +03:00
Alex Tselegidis
1067a92a18 Renamed further "unavailabilities" occurrences to "unavailability events" 2020-10-21 21:44:35 +03:00
Alex Tselegidis
f7ca104836 Moved duplicated code into re-usable library classes 2020-10-21 21:37:47 +03:00
Alex Tselegidis
d2dd9925ec Added icon in the language pick label of the backend footer. 2020-10-21 21:37:21 +03:00
Alex Tselegidis
e0dea50ee4 Renamed the unavailabilities to unavailability events 2020-10-21 21:36:37 +03:00
Alex Tselegidis
8031104d49 Added subtitle in the backend header 2020-10-21 21:36:05 +03:00
Alex Tselegidis
0e6fdebe0f Completed the working plan exceptions feature. 2020-10-20 16:05:00 +03:00
Alex Tselegidis
5e6476c0f5 Moved the first "next" button of the booking page to the right side of the wizard 2020-10-20 16:04:25 +03:00
Alex Tselegidis
93dce95c51 Single quotes in routes.php 2020-10-20 16:04:25 +03:00
Alex Tselegidis
90147026f3 Changed custom availability period related translations 2020-10-20 16:04:25 +03:00
Alex Tselegidis
9dbc7ae000 Updated the styling of the required fields 2020-10-20 16:03:56 +03:00
KibGim
c5cc7d05b6
Update translations_lang.php - italian 
Translation of the latest rows from English to Italian.
 2020-10-19 18:05:54 +02:00
Alex Tselegidis
54d1ae83dc Removed the required fields message in ui (below the forms) 2020-09-28 15:25:56 +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
454c135f0b Updated translations message 2020-09-28 15:13:01 +03:00
Alex Tselegidis
4a4403e9a1 Replaced required fields with red stars and removed form message 2020-09-28 15:12:49 +03:00
Alex Tselegidis
d9985643f3 Additional styling for the frontend pages. 2020-09-28 14:42:32 +03:00
Alex Tselegidis
0cd6e793c2 Added parethnesis between the utc time difference of the timezone list items 2020-09-28 13:51:38 +03:00
Alex Tselegidis
13ff9cfc4a Replaced exclamation mark with period in translation messages. 2020-09-28 13:51:12 +03:00
Alex Tselegidis
2f32c4cd08 Styling for the login button of the booking page 2020-09-28 13:43:57 +03:00
Alex Tselegidis
b54fe7946b Added fontawesome to general pages 2020-09-28 13:34:47 +03:00
Alex Tselegidis
068a3995b0 Further fixes on the google synyc activation (#890). 2020-09-24 10:26:29 +03:00
Alex Tselegidis
4c10b5a173 Add scope to the google sync client (#890). 2020-09-24 09:43:11 +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
46a176db5b Updated the default service currency value 2020-09-23 14:59:43 +03:00
Alex Tselegidis
36d387accf Styling changes to the email templates 2020-09-23 14:55:48 +03:00
Alex Tselegidis
f05aab39ca Styling adjustments to the booking footer elements 2020-09-23 14:53:30 +03:00
Alex Tselegidis
abe6de3ab5 Added more information to the ICS file, sent with the email confirmation. 2020-09-23 14:53:15 +03:00
Alex Tselegidis
cfc6167d4f Use the "alnum" method when generating random strings via the codeigniter helper function (generates shorter strings) 2020-09-23 14:37:09 +03:00
Alex Tselegidis
8dce5bf17a Added Easy!Appointments to the mail template titles 2020-09-23 14:36:39 +03:00
Alex Tselegidis
c04058f6f5 Corrected the reset password mail notification 2020-09-23 14:36:22 +03:00
Alex Tselegidis
8dd346c90e Improved display of booking page footer for desktop viewports 2020-09-23 14:29:18 +03:00
Alex Tselegidis
e7800e5302 FontAwesome icon improvements in the view files 2020-09-23 14:18:50 +03:00
Alex Tselegidis
a3dfb91550 Improvements in the user language storage feature. 2020-09-23 13:48:07 +03:00
Alex Tselegidis
5706447ea6 Problem with links in legal content (#813). 2020-09-23 13:44:12 +03:00
Alex Tselegidis
10df66fddb The "created" and "modified" consent fields are date time and they need a proper date time value 2020-09-23 13:36:24 +03:00
Alex Tselegidis
ed262c2e9a Corrected the migration file name 2020-09-23 13:33:29 +03:00
Alex Tselegidis
683aa269b0 Use the codeigniter random string generation function for creating random passwords (#680). 2020-09-23 13:16:37 +03:00
Alex Tselegidis
12c25da042 Removed unnecessary command from Google_sync.php 2020-09-23 13:16:37 +03:00
Alex Tselegidis
532548d64d Proper use of the property phpdoc tag 2020-09-23 13:16:37 +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
f5a94ea6fe Notify admins and secretaries on appointment changes (#889). 2020-09-23 12:42:18 +03:00
Alex Tselegidis
30eb95461a Improvements and fixes on the custom availability feature 2020-09-23 12:24:42 +03:00
Alex Tselegidis
1aa8132e4d Added console commands and support for triggering the google sync from the terminal 2020-09-23 12:24:20 +03:00
Alex Tselegidis
fc02e55a69 Removed the notifications library (it will be implemented on an upcoming version). 2020-09-23 11:35:54 +03:00
Alex Tselegidis
ae1f951cf8 Resolve the any-provider selection before processing provider information (#885). 2020-09-21 14:26:21 +03: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
e2bbef8fff Added project attribution in every page. 2020-09-08 10:21:40 +03:00
Alex Tselegidis
73e976ddab Replaced the check icons. 2020-09-08 09:58:10 +03:00
Alex Tselegidis
64cdbfb445 Applied the switcher widget for the settings user notifications 2020-09-07 14:51:52 +03:00
Alex Tselegidis
4a7d6e5d6e Added required fields message in all forms. 2020-09-07 14:40:59 +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
6f69c52a3f Consistent use of html title (except from booking page). 2020-09-07 13:54:37 +03:00
Alex Tselegidis
b4ad00d9f3 Moved inline styles in external css files 2020-09-07 13:51:50 +03:00
Alex Tselegidis
6c1af6dc71 Removed data structure comment from models. 2020-09-07 13:35:28 +03:00
Alex Tselegidis
20cb8b3a01 Reformatting for GlobalVariables definition. 2020-09-07 13:34:52 +03:00
Alex Tselegidis
28afe4d1c7 Replaced document ready call in all templates 2020-09-07 13:30:24 +03:00
Alex Tselegidis
0b203c00c6 Updated the About Easy!Appointments links. 2020-09-07 13:23:26 +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
529e418589 Set default notifications setting value for the installation admin. 2020-09-07 11:45:57 +03:00
Alex Tselegidis
185686d194 Replaced custom toggle buttons with bootstrap switcher component. 2020-09-07 11:36:36 +03:00
Alex Tselegidis
02628a2cbd Random password for installation provider record. 2020-09-07 11:18:08 +03:00
Alex Tselegidis
5220e87249 Renamed installation helper method 2020-09-07 11:15:58 +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
889f093942 Corrected migration names. 2020-09-07 11:05:08 +03:00
Alex Tselegidis
0e0a5e6b20 Removed the subpackage phpdoc tag (not supported). 2020-09-07 10:56:40 +03:00
Alex Tselegidis
395b329e78 Minor formatting changes in API_V1_Controller.php 2020-09-03 14:59:05 +03:00
Alex Tselegidis
f05a4be918 Renamed the step_*_title translation keys to meaningful keys based on their content (most translations kept unchanged as the previous texts still matches) 2020-09-03 14:57:17 +03:00
Alex Tselegidis
5c207751a8 Removed aria and role attributes for maintaining leaner HTML markup in the view files. 2020-09-03 14:48:58 +03:00
Alex Tselegidis
e8e3ae8598 Use nav-pills for page sub navigation. 2020-09-03 14:44:02 +03:00
Alex Tselegidis
9b3502bf4a Consistent use of the backend-page css class 2020-09-03 14:35:58 +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
a7eecb1a4c Changed the body background of the helper pages 2020-09-03 14:13:51 +03:00
Alex Tselegidis
1af5dc0774 The backend styling is structured in a mobile-first way. 2020-08-31 20:11:02 +03:00
Alex Tselegidis
4b69cf1797 Further styling for the cancel/delete header rows of the booking page. 2020-08-31 18:34:06 +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
ad320cab52 Responsive corrections for the book success and message pages 2020-08-31 17:09:13 +03:00
Alex Tselegidis
2c330a0a86 The booking page styling is now mobile-first oriented. 2020-08-31 17:02:54 +03:00
Alex Tselegidis
81cfe6a16d Replaced echo statements with php's shortcode syntax 2020-08-31 13:32:58 +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
6cbb13dc2d Replaced the CDN fontawesome version with a local one. 2020-08-15 18:55:35 +03: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
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
Alex Tselegidis
6348b1af56
Merge pull request #778 from popod/fix-service-details-display-in-booking-page 
Fix display of service details when the service change in the booking process
 2020-08-15 16:07:02 +03:00
Alex Tselegidis
65d3243986 Add the appointment has in the stored "dest_url" value when trying to access the calendar page without being logged in first (#804). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
dbc45f6b27 Do not allow appointments being created with duration less than the predefined minimum (#805). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
4f1c39b564 Consider the book advance timeout when generating unavailable dates (#855). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
177375e814
Merge pull request #784 from idstam/swedish-translation 
Swedish translations
 2020-08-15 15:58:06 +03:00
Alex Tselegidis
39a12a593f Merge branch 'spanish-translation-mejora' of https://github.com/rulosant/easyappointments into rulosant-spanish-translation-mejora 2020-08-15 14:22:30 +03:00
Janina Phillips
33e11291bc
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-07-19 18:56:51 -04:00
Janina Phillips
b6391ab668 fix calendar height to just adjust depending on the content and other fixes 2020-07-01 09:02:11 -04:00
Alex Tselegidis
d8a7318c95 Added missing response variable 2020-07-01 10:16:09 +02:00
Sébastien
a4056eb50b Fix some modal title and "close" button display 2020-06-29 15:31:59 +02:00
Sébastien
e87ef4a4c1 Remove old "glyphicon" icons. 2020-06-29 15:23:51 +02:00
Sébastien
58ad2e43a1 Fix "for" property for "accept to provacy policy" checkbox label in appointment process. 2020-06-29 15:04:41 +02:00
Janina Phillips
63072ead77 fix some bugs 2020-06-19 11:17:31 -04:00
Sébastien
101316a72f Fix: replace invisible class by d-none. 2020-06-19 13:13:08 +02:00
Sébastien
655cafbfc5 Unify btn styling on users page 2020-06-19 13:11:25 +02:00
Sébastien
81934f2d90 Fix: replace all btn-default class by btn-light. 2020-06-19 13:09:22 +02:00
Sébastien
1fa749d16b Fix: replace all label class by badge. 2020-06-19 12:48:18 +02:00
Janina Phillips
1e855182bd hidden is now d-none 2020-06-18 14:37:11 -04:00
Janina Phillips
1bd2647b77 fix some icons and styles 2020-06-18 14:23:16 -04:00
Sébastien
0b3d97ff1f Fix loading item always displayed on the installationn page. 2020-06-17 16:42:29 +02:00
Sébastien
1e6a13d146 Save customer language. 2020-06-16 17:01:27 +02:00
Alex Tselegidis
e857d3a37e Corrected issue with attendants number query 2020-06-14 10:56:35 +02:00
Janina Phillips
2dc94f30c7
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-06-09 10:36:54 -04:00
Sébastien
18d0541114 Improve the "help block" for the book advance timeout field in french. 2020-06-05 20:36:40 +02:00
Sébastien
5a03ecd736 Improve some french translations about book advance timeout. 2020-06-05 20:34:20 +02:00
Sébastien
950738f2fe Redirect clients which are tying to update an appointment during the book advance timeout to a warning page. 2020-06-05 18:24:05 +02:00
Sébastien
8704413c0f Do not add bookAdvanceTimeout delay to new appointment modal on the backend. 2020-06-05 17:29:35 +02:00
Alex Tselegidis
1821e50116 Added catalan translations to the app (thanks to Marc Folch) 2020-06-04 12:57:14 +02:00
Johan Idstam
8236b39e84 Swedish for translations_lang.php 2020-05-18 21:44:03 +02:00
Johan Idstam
9996b38e1e Swedish for migration_lang.php 2020-05-18 20:10:40 +02:00
Johan Idstam
2b561122a7 Add Swedish to config 2020-05-18 20:07:45 +02:00
Johan Idstam
c82df14ba0 Swedish for email_lang.php 2020-05-18 20:07:08 +02:00
Johan Idstam
d5605a00f1 Swedish for db_lang.php 2020-05-18 19:58:17 +02:00