Commit graph

75 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
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
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
84afca8b26 Integrated location field in the backend section. 2019-06-08 16:43:21 +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
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
Andrea
d971f4f097 Added time format selection 2018-03-06 12:20:47 +01:00
alext
e8f0f57380 Integrated asset_helper method for cache busting. 2017-11-14 14:01:49 +01:00
alext
e505f2bd32 Used bootstrap form validation helpers. 2017-11-14 13:52:59 +01:00
alext
6ba3d7ce70 Corrected event sourcing for new fullcalendar version. 2017-10-31 10:37:00 +01:00
alext
3ec8c25452 Corrections in Bootstrap's grid classes. 2017-10-03 12:27:02 +02:00
alext
de23443559 User interface enhancements (template refactoring). 2017-09-23 03:42:14 +02:00
alext
71c1bf38ff Styling improvements in backend calendar form. 2017-09-22 22:33:40 +02:00
alext
4fd5162a05 Replaced echo tags with php short tags in view files. 2017-09-14 15:18:20 +02:00
alext
34cf06917c Corrected base_url calls 2017-09-08 14:13:22 +02:00
alext
5119e757f6 Integrated "lang" helper in view files. 2017-09-08 14:06:37 +02:00
alext
29e7fb7496 Adjusted script and link HTML tags. 2017-09-05 14:58:34 +02:00
alext
11ab8487cc Removed old Bootstrap (v2) class. 2017-08-10 09:58:42 +02:00
alext
9ff11db2e6 Corrected backend/calendars view typo. 2016-12-04 13:09:25 +01:00
alextselegidis
2c38a2165e Corrected appointment form layout. 2016-10-20 23:00:34 +02:00
Alex Tselegidis
03db821359 Added fixed table headers in the table calendar view. 2016-08-11 22:08:55 +02:00
Alex Tselegidis
d78710f60b Added fullscreen toggle button to table view. 2016-07-24 13:26:20 +02:00
Alex Tselegidis
6d074398d0 Corrected popover actions in both calendar view (#182). 2016-07-18 22:55:05 +02:00
Alex Tselegidis
3bba2269b8 Loaded the new JS files of the backend calendar page. 2016-07-17 14:44:08 +02:00
Alex Tselegidis
a9edbda7a7 Split the calendar view functionality into new module (#182). 2016-07-17 13:46:38 +02:00
Alex Tselegidis
6cda484e1d The calendar view setting will be available to javascript through GlobalVariables.calendarView (#182). 2016-07-17 13:04:44 +02:00
Alex Tselegidis
057e3d139a UI Corrections 2016-07-16 20:14:10 +02:00
Alex Tselegidis
c6728ee99e Added missing class to input element. 2016-07-16 18:14:49 +02:00
Alex Tselegidis
bb83b6b839 Added updated .gitignore with storage directory. 2016-07-13 22:56:05 +02:00
Alex Tselegidis
b8b1d546fd Responsive design refactoring for the backend/calendar page. 2016-07-12 22:02:59 +02:00
Alex Tselegidis
5161a8b4bb Corrected the sticky footer issue. 2016-03-22 22:36:48 +01:00
h3ct0r
1c4ab83d32 Fixed css bug; Added support for case insensitive search for clients and search by notes too! 2016-03-10 12:55:00 -03:00
Alex Tselegidis
181595d8bd Corrected selectors for backend appointment & unavailable modals. 2016-01-24 15:40:06 +01:00
Alex Tselegidis
e9b82fac12 Corrected HTML typo 2015-12-12 00:22:26 +01:00
Alex Tselegidis
c60a0feeaf Added the dateFormat value to the GlobalVariables of every backend page. 2015-12-01 23:39:31 +01:00
Alex Tselegidis
ba5ef4d326 Corrected undefined variable error in calendar.php 2015-11-28 11:52:42 +01:00
Alex Tselegidis
f4da9e6f52 Added btn-default class to calendar.php 2015-08-13 20:36:44 +02:00
Alex Tselegidis
4e46417ee6 Added various UI fixes 2015-08-13 20:33:47 +02:00
Alex Tselegidis
7ebe58d4f4 Corrected calendar-filter element in backend/calendar.php 2015-07-27 23:11:15 +02:00
Alex Tselegidis
1812d66bb4 Fixed problem with JS manipulation of provider sync state. 2015-07-27 22:29:20 +02:00
Alex Tselegidis
d70db22269 Updated js part after html refactoring. 2015-07-25 11:47:46 +02:00
Alex Tselegidis
7b98a9e6f7 fixed #manage-unavailable 2015-07-22 22:16:47 +02:00
Alex Tselegidis
cdb14b5c95 fixed #manage-appointment modal 2015-07-22 22:14:03 +02:00
Alex Tselegidis
8a9a21d9eb Updated backend/calendar page with bootstrap 3 2015-07-20 23:39:50 +02:00
Alex Tselegidis
e90fef38c1 issue #42 use ext dir 2015-07-08 00:17:39 +02:00
Alex Tselegidis
ad8c9b6522 Added csrfToken to GlobalVariables definition. 2015-05-27 23:47:19 +02:00
Alex Tselegidis
45753adbd0 Refactored config file 2015-01-28 23:53:13 +01:00
Alex Tselegidis
3213e5cc90 Corrected typo in backend appointment modal. 2015-01-21 21:12:30 +01:00
alextselegidis@gmail.com
919c3da18d Fixes in minor bugs. 2014-01-11 00:07:25 +00:00