mirrors
/
easyappointments
mirror of https://github.com/alextselegidis/easyappointments.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
1,343 Commits 4 Branches 39 Tags 66 MiB
Commit Graph

43 Commits

Author SHA1 Message Date
Alex Tselegidis dd44f8e132 Merge branch 'oxteam-dev-first_week_day' of https://github.com/oxteam/easyappointments into oxteam-oxteam-dev-first_week_day 
# Conflicts:
#	src/application/language/portuguese-br/translations_lang.php
#	src/assets/js/backend_calendar_default_view.js
#	src/assets/js/backend_users_providers.js
#	src/assets/js/general_functions.js
#	src/assets/js/working_plan.js
 2020-03-10 20:32:53 +01:00
oxteam 8ca935c412 Fix display of breaks in the backend for working plans stored in database with Monday as the first weekday (EA! Issue #506). 
Prior commit 00372f2f1a, the first weekday was Monday.
After this commit, it is set to Sunday and the display of breaks in the backend calendar is broken for former working plans.

The fix consists in reordering the working plan elements with Sunday as the first day prior displaying the backend calendar.
In addition, the working plan elements are also reordered when displaying 'Settings/Business Logic' and 'Users/Providers' tabs.
This is to ensure that breaks are always displayed with Sunday first, like done for the Working Plan in those tabs, for consistency purpose..
 2020-03-10 20:28:11 +01:00
Alex Tselegidis 7d04052697 Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days 
# Conflicts:
#	src/application/config/migration.php
#	src/application/language/arabic/translations_lang.php
#	src/application/language/bulgarian/translations_lang.php
#	src/application/language/chinese/translations_lang.php
#	src/application/language/danish/translations_lang.php
#	src/application/language/dutch/translations_lang.php
#	src/application/language/english/translations_lang.php
#	src/application/language/finnish/translations_lang.php
#	src/application/language/french/translations_lang.php
#	src/application/language/german/translations_lang.php
#	src/application/language/greek/translations_lang.php
#	src/application/language/hindi/translations_lang.php
#	src/application/language/hungarian/translations_lang.php
#	src/application/language/italian/translations_lang.php
#	src/application/language/japanese/translations_lang.php
#	src/application/language/luxembourgish/translations_lang.php
#	src/application/language/polish/translations_lang.php
#	src/application/language/portuguese-br/translations_lang.php
#	src/application/language/portuguese/translations_lang.php
#	src/application/language/romanian/translations_lang.php
#	src/application/language/russian/translations_lang.php
#	src/application/language/slovak/translations_lang.php
#	src/application/language/spanish/translations_lang.php
#	src/application/language/turkish/translations_lang.php
#	src/assets/js/general_functions.js
#	src/assets/js/working_plan.js
#	src/assets/sql/data.sql
 2020-03-10 20:09:31 +01:00
oxteam 45db34cb52 Merge branch 'develop' into oxteam-dev-first_week_day 2019-07-30 14:38:59 +02:00
alext 62e28d381d Merged pull request #221 - Fixed/Improved sort breaks increasingly by hour within day 2019-06-08 16:48:24 +02:00
oxteam 813a9049d8 Remove unnecessary call to the timepickers function. 2018-07-06 02:07:34 +02:00
oxteam beaa309054 Days sorted also in the Users and Setting pages in the backend. 2018-07-06 01:21:24 +02:00
oxteam 78bd5e67fd Fix display of breaks in the backend for working plans stored in database with Monday as the first weekday (EA! Issue #506). 
Prior commit 00372f2f1a, the first weekday was Monday.
After this commit, it is set to Sunday and the display of breaks in the backend calendar is broken for former working plans.

The fix consists in reordering the working plan elements with Sunday as the first day prior displaying the backend calendar.
In addition, the working plan elements are also reordered when displaying 'Settings/Business Logic' and 'Users/Providers' tabs.
This is to ensure that breaks are always displayed with Sunday first, like done for the Working Plan in those tabs, for consistency purpose..
 2018-06-28 17:56:24 +02:00
Andrea 721df5833d Update for new time format 2018-04-12 16:15:18 +02:00
Andrea 9c7ae5dfdc Extra working days outside default working plan 
Add function to add extra working days outside the default working plan.
 2018-04-12 15:03:46 +02:00
alext ead4ae5985 Corrections in the datetimepicker and timepicker formatting. 2018-03-28 14:41:27 +02:00
alext 4d6b452dd6 Updated copyright year in file headers. 2018-03-27 09:23:09 +02:00
alext 610f184aad Further formatting corrections. 2018-03-17 18:00:55 +01:00
alext 1caccb731a Changed the time formatting in javascript files. 2018-03-08 14:55:51 +01:00
Andrea d971f4f097 Added time format selection 2018-03-06 12:20:47 +01:00
alext e013943fde Reformatted code files. 2018-01-23 10:08:37 +01:00
alext 3a9ae7f4a3 Corrected initial values of working plan script. 2017-12-20 15:16:09 +01:00
alext faa911276e Corrected time handling in working plan management components. 2017-11-17 15:09:04 +01:00
alext 00372f2f1a Set Sunday as the first day of the week. 2017-11-15 23:19:17 +01:00
alext 7bfcd87e1d Convert time format to AM/PM. 2017-10-31 12:56:29 +01:00
alext b8d7c1b839 Styling corrections in the working plan input fields. 2017-10-31 12:16:45 +01:00
alext de23443559 User interface enhancements (template refactoring). 2017-09-23 03:42:14 +02:00
alext 980ab7786a Refactored use of global EALang object. 2017-09-11 16:09:15 +02:00
alext 1fab63a08b Changed code style 2017-03-10 09:24:27 +01:00
alext 2dad4dfc34 Updated copyright year. 2017-01-31 07:35:34 +01:00
alextselegidis 8a9a3b2192 Corrected working plan event handling that was failing due to invalid relative selectors (fixes #218). 2016-10-23 21:52:36 +02:00
p0zi 5534ebd1f7 218 - Unable to edit providers breaks in Google Chrome [https://github.com/alextselegidis/easyappointments/issues/218] 
Small fix to previous commit
 2016-10-21 01:54:54 +02:00
p0zi 4163a40a5e 218 - Unable to edit providers breaks in Google Chrome [https://github.com/alextselegidis/easyappointments/issues/218] 2016-10-21 01:41:17 +02:00
alextselegidis ece2374328 Corrected display of working plan in settings page. 2016-10-06 20:40:20 +02:00
Alex Tselegidis 482a863a98 Enhancements in the working_plan.js comments. 2016-05-14 12:28:42 +02:00
Alex Tselegidis 382acd119c Refactored working_plan.js 2016-04-26 19:45:17 +02:00
Alex Tselegidis 3f8fd91714 Commited current refactoring state of working_plan.js (not finished yet). 2016-04-24 19:28:33 +02:00
Alex Tselegidis 86644cfa9c Updated the copyright date. 2016-01-02 14:47:04 +01:00
Alex Tselegidis 88cc9f1574 UI fixes for the app. 2015-10-05 00:31:06 +02:00
Alex Tselegidis 651c2c5101 Updated users page for bootstrap 3. 2015-07-25 14:04:23 +02:00
Alex Tselegidis 7cf37efa7b Added credentials docblock banner. 2015-07-20 21:41:24 +02:00
alextselegidis@gmail.com 919c3da18d Fixes in minor bugs. 2014-01-11 00:07:25 +00:00
alextselegidis@gmail.com 6b03dcff90 Added language selection functionality to backend pages. 2013-12-23 16:55:42 +00:00
alextselegidis@gmail.com 4767dc36f9 * Translated datetime pickers. 
* Merged translation files into one per language.
 2013-12-20 17:44:44 +00:00
alextselegidis@gmail.com 9c1b3b47e6 Completed backend settings page translation. 2013-12-20 11:12:36 +00:00
alextselegidis@gmail.com ec6b0678ca Translated backend calendar, services and users pages. 2013-12-19 16:28:19 +00:00
alextselegidis@gmail.com 8f90da86be * Completed the installation process. 
* Added tooltip texts on the common controls of backend.
* GUI fixes on several pages.
 2013-10-17 15:31:43 +00:00
alextselegidis@gmail.com 148258385c * Optimized js code for the backend pages. 2013-09-25 15:43:17 +00:00