Commit graph

61 commits

Author SHA1 Message Date
Alex Tselegidis
e1e9a60085 Moved source files to the root directory. 2020-03-11 10:24:25 +01:00
Alex Tselegidis
95b303cd6d Updated copyright year in source files. 2020-03-11 10:10:59 +01:00
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
14bbd793bf Merged pull request #282 - Added action link icons in the backend calendar page, event popover component. 2019-06-08 17:20:49 +02:00
oxteam
734be96126 Add new system-wide setting that enable users to choose the first day of the week. (#471)
The setting change the display of weeks shown in backend and booking page calendars.
Work plans and break lists in the 'settings' page are still displayed starting on Sunday.
2018-06-29 00:42:52 +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
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
4d6b452dd6 Updated copyright year in file headers. 2018-03-27 09:23:09 +02: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
edbe78c6f4 The details string of the error message box becomes a button. 2018-02-02 08:19:28 +01:00
alext
e013943fde Reformatted code files. 2018-01-23 10:08:37 +01:00
alext
049884d409 Added more information into the ajax exception messages. #370 2017-11-15 23:48:19 +01:00
alext
4114bdc7bb Dialog buttons should be defined with an array. 2017-11-14 13:55:35 +01:00
alext
7bfff7bfe0 Changed object properties reference style. 2017-11-02 14:19:54 +01:00
alext
7bfcd87e1d Convert time format to AM/PM. 2017-10-31 12:56:29 +01:00
alext
980ab7786a Refactored use of global EALang object. 2017-09-11 16:09:15 +02:00
alext
2dad4dfc34 Updated copyright year. 2017-01-31 07:35:34 +01:00
alextselegidis
ecce8fb1c3 Spelling corrections 2016-10-10 18:29:48 +02:00
Alex Tselegidis
c73e990e81 The booking wizard will parse two new GET parameters for setting default values to providers and services (fixes #24). 2016-07-16 21:06:55 +02:00
Alex Tselegidis
279b931d80 Refactored js code. 2016-07-15 20:52:21 +02:00
Alex Tselegidis
bb87fb51bd Enhancements in the general_functions.js comments. 2016-05-14 12:25:20 +02:00
Alex Tselegidis
c85d89c5ee Refactored the general_functions.js file. 2016-04-24 19:09:33 +02:00
Alex Tselegidis
5ad3041c2c Removed console.log calls from the javascript files. 2016-04-02 12:02:17 +02:00
Alex Tselegidis
df0d81f68c Fixes #121: Replaced the 'validateEmail' validation with a RFC822 regex expression. 2016-02-15 22:19:04 +01:00
Alex Tselegidis
e252307e66 Improved AJAX error handling. 2016-01-09 22:55:07 +01:00
Alex Tselegidis
86644cfa9c Updated the copyright date. 2016-01-02 14:47:04 +01:00
Alex Tselegidis
d9b8e4242a Corrected JS comment typos. 2015-12-30 23:02:07 +01:00
Alex Tselegidis
e7b9b80264 Added dynamic date formats to backend/calendar page (not finished yet). 2015-12-11 00:04:40 +01:00
Alex Tselegidis
284abdfd54 Added date dynamic date format to booking wizard. 2015-12-01 23:25:59 +01:00
Alex Tselegidis
b94d0dc0f3 Escaped the html special characters in the confirmation step of the booking wizard for preventing direct XSS malfunction 2015-11-28 12:55:03 +01:00
Alex Tselegidis
10be169229 Fixes #10 2015-10-11 22:30:18 +02:00
Alex Tselegidis
a24597ba4d Added ajax failure handler to jquery post requests. 2015-10-08 23:12:59 +02:00
Alex Tselegidis
6de4784ee7 Added active effect to language selection label. 2015-10-06 00:20:55 +02:00
Alex Tselegidis
88cc9f1574 UI fixes for the app. 2015-10-05 00:31:06 +02:00
Alex Tselegidis
7cf37efa7b Added credentials docblock banner. 2015-07-20 21:41:24 +02:00
Alex Tselegidis
d88c138d2d Added csrfToken to js post requests 2015-05-27 23:42:40 +02:00
alextselegidis
fd0a9177cd Added index.php in js ajax urls (without mod rewrite) 2015-05-20 22:26:11 +02:00
Alex Tselegidis
e223b7a5b5 minor modifications in the general_functions.js 2015-04-26 16:20:16 +02:00
Alex Tselegidis
45753adbd0 Refactored config file 2015-01-28 23:53:13 +01:00
alextselegidis@gmail.com
7ac98c1e8d * Added update algorithm.
* Fixed firefox issues
2014-01-04 17:25:21 +00:00
alextselegidis@gmail.com
3059f03a3d Applied minor code corrections. 2013-12-29 13:57:09 +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
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
e596cb768a * Completed login + logout operation.
* Updated the way the system stores passwords in db.
2013-09-23 15:42:36 +00:00