Commit graph

976 commits

Author SHA1 Message Date
alext
e8f0f57380 Integrated asset_helper method for cache busting. 2017-11-14 14:01:49 +01:00
alext
4114bdc7bb Dialog buttons should be defined with an array. 2017-11-14 13:55:35 +01:00
alext
e505f2bd32 Used bootstrap form validation helpers. 2017-11-14 13:52:59 +01:00
alext
3bc482adf4 Added asset_helper file and cache busting token config. 2017-11-08 15:22:30 +01:00
alext
e0f49c1d54 Added calendar select functionality. 2017-11-08 15:17:29 +01:00
alext
d4594bd583 Corrected syntax error in frontend_book.js 2017-11-05 16:31:28 +01:00
alext
7bfff7bfe0 Changed object properties reference style. 2017-11-02 14:19:54 +01:00
alext
89890dab4f Corrected go-to date functionality. 2017-11-02 14:11:41 +01:00
alext
35d812a550 Added ICS invitation files in notifications as attachments. 2017-11-02 14:09:15 +01:00
alext
5c00bd9c82 Created helper class for ICS files. 2017-11-01 14:24:25 +01:00
alext
6aab04ce17 Added jsvrcek\ics composer package. 2017-11-01 14:23:44 +01:00
alext
32e618975a Updated CodeIgniter to v3.1.6 2017-10-31 13:00:54 +01:00
alext
7bfcd87e1d Convert time format to AM/PM. 2017-10-31 12:56:29 +01:00
alext
23b64463ca Corrected backend modal message element styling. 2017-10-31 12:48:06 +01:00
alext
38dc2bd459 Adjusted working plan styling so that it matches the one from users page. 2017-10-31 12:20:06 +01:00
alext
4ce43bced3 jQuery UI datepicker improvements. 2017-10-31 12:17:14 +01:00
alext
36bc53960b Reformatted stylesheet files. 2017-10-31 12:17:01 +01:00
alext
b8d7c1b839 Styling corrections in the working plan input fields. 2017-10-31 12:16:45 +01:00
alext
bc20ce8c21 Display corrections in the filter search input field of backend pages. 2017-10-31 11:52:25 +01:00
alext
4c6547de09 Passed date_format setting to the email notifications class. 2017-10-31 11:42:53 +01:00
alext
7fbc350488 Corrected event resize and drag & drop behavior of the calendar component. 2017-10-31 11:34:06 +01:00
alext
5741fca71d Corrections in the event popovers of the calendar page. 2017-10-31 11:13:53 +01:00
alext
6ba3d7ce70 Corrected event sourcing for new fullcalendar version. 2017-10-31 10:37:00 +01:00
alext
5fb9b9466e Updated fullcalendar dependency and added momentjs 2017-10-19 21:20:47 +02:00
alext
3b1c662db3 Updated fullcalendar dependency. 2017-10-19 21:20:08 +02:00
alext
d6e1d32fc8 Renamed insert and update methods (based on the project conventions). 2017-10-19 14:27:04 +02:00
alext
ee48938911 Corrected working plan indents. 2017-10-08 11:11:04 +02:00
alext
3ec8c25452 Corrections in Bootstrap's grid classes. 2017-10-03 12:27:02 +02:00
alext
05936ebe83 Removed DEFAULT NULL declaration as it's optional. 2017-10-02 11:49:27 +02:00
alext
f166feb32f Avoid translation conflicts by setting the interal text value of message dialog butons. 2017-09-23 03:49:46 +02:00
alext
de23443559 User interface enhancements (template refactoring). 2017-09-23 03:42:14 +02:00
alext
c424c0bc6d Reformatted PHP files 2017-09-23 01:30:22 +02:00
alext
17fd69cce6 Styling improvements for the backend customers page. 2017-09-23 01:27:07 +02:00
alext
71c1bf38ff Styling improvements in backend calendar form. 2017-09-22 22:33:40 +02:00
alext
861f49c259 Integrated bootstrap tabs into the backend services page. 2017-09-22 14:53:41 +02:00
alext
80c6b61686 Integrated bootstrap tabs into the backend users page. 2017-09-22 14:52:59 +02:00
alext
355ddaeda4 Integrated tab component to settings page. 2017-09-21 14:49:13 +02:00
alext
36e507adc0 Integrated output class in controllers. 2017-09-20 16:09:01 +02:00
alext
579b59b1ec Integrated input class in controllers. 2017-09-19 15:44:32 +02:00
alext
9366089c82 Direct file access must not be permitted. 2017-09-15 13:44:40 +02:00
alext
fcb4b9d5cf Autoformatted php files based on CodeIgniter style guide. 2017-09-15 13:36:37 +02:00
alext
c8991a5858 Date format must be included in the company settings. 2017-09-14 15:18:51 +02:00
alext
4a0ee51122 Corrected displayed string. 2017-09-14 15:18:36 +02:00
alext
4fd5162a05 Replaced echo tags with php short tags in view files. 2017-09-14 15:18:20 +02:00
Waldy Almonte
1001255aa5 Updated new language keys
Updated the untranslated text.
2017-09-13 11:14:18 -04:00
alext
980ab7786a Refactored use of global EALang object. 2017-09-11 16:09:15 +02:00
alext
c56650d1b8 Updated project version. 2017-09-08 14:22:47 +02:00
alext
e82aeb1fd4 Removed unused directories. 2017-09-08 14:15:26 +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
0998e85001 Updated comments in model classes. 2017-09-08 14:03:45 +02:00
alext
539e753b80 Adjusted phpdoc blocks in controller classes. 2017-09-06 15:22:11 +02:00
alext
29e7fb7496 Adjusted script and link HTML tags. 2017-09-05 14:58:34 +02:00
nforlando
3e9447a853 Update file
I'm not sure about the translation of 'up' and 'down' method because I am not certain about the context and its meaning. Please re evaluate those translations.
2017-08-17 23:54:40 -03:00
alext
ae8d7e2914 Adjusted sql assets. 2017-08-15 08:20:23 +02:00
alext
ae462c1efb Corrected translation key 2017-08-14 09:54:35 +02:00
alext
11ab8487cc Removed old Bootstrap (v2) class. 2017-08-10 09:58:42 +02:00
alext
6750293466 Login requires jQuery UI dependencies. 2017-08-10 09:57:01 +02:00
alext
2ca14cee2c Corrected grid classes in footer. 2017-08-10 09:56:34 +02:00
alext
32b275b73c Replaced intval with (int) constructor. 2017-08-08 09:49:39 +02:00
alext
d685cae118 Corrected translation 2017-08-08 09:47:22 +02:00
alext
cdde2fb501 Customers weren't able to change the application language in frontend. 2017-08-01 08:39:03 +02:00
alext
1212cd51f3 Corrected post filtering row selection for categories. 2017-07-25 08:33:21 +02:00
alext
e202abc82b Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	src/vendor/composer/autoload_static.php
2017-07-17 22:59:57 +02:00
alext
fe3c9ba08e Updated composer files. 2017-07-17 22:57:58 +02:00
alext
43ba0f80ea Merge branch 'patch-1' of https://github.com/PatchworkBoy/easyappointments into PatchworkBoy-patch-1 2017-07-15 17:13:05 +02:00
Marci
4256244360 Fix JS error (dialog() not a function)
Appears jquery-ui js & css omitted, but required for $(‘#messagebox’).dialog() calls.
2017-07-11 11:27:47 +01:00
alext
d91bebae18 Email notifications must honor the date format value (#342). 2017-07-04 08:46:54 +02:00
alext
dcda4b9982 Correct post-filtering selection for services (revised). 2017-07-01 20:13:30 +02:00
alext
483e2348a1 Updated CodeIgniter to v3.1.5 2017-06-29 15:35:42 +02:00
alext
1c0458b7aa Removed test view file. 2017-06-29 00:12:59 +02:00
alext
54897e8a3f Correct post-filtering selection for services. 2017-06-25 20:43:17 +02:00
alext
1e88d37879 Suppress Google Syncing exception whenever a Google Calendar event is not found. 2017-06-23 09:53:22 +02:00
alext
aff86bd021 Refactored structure.sql 2017-06-19 09:46:06 +02:00
alext
358ecbfc9e Corrected charset of db table. 2017-06-18 19:36:45 +02:00
alext
78d07b91a1 Removed initial auto increment offsets. 2017-06-18 19:26:34 +02:00
alext
9f89aed556 Move initial installation entries to data.sql 2017-06-18 18:30:12 +02:00
alext
04dfc6a7e9 Added max length value to back-end users page. 2017-06-17 18:54:09 +02:00
alext
fe5341a0af Changed message buttons in order to avoid issues with invalid translations. 2017-06-16 08:51:05 +02:00
alext
32d4cf8bf2 Corrected column class. 2017-06-14 09:07:41 +02:00
alext
7b682e5c16 Updated gulp composer task and files. 2017-06-11 21:52:13 +02:00
alext
bda091449c Updated gitignore 2017-06-11 21:51:36 +02:00
alext
f67d4768bb Do not use start_session directly as the required options from app config are not being used (#334). 2017-06-11 21:12:21 +02:00
alext
2777be03da Dedicated service or provider selections must not be disabled. 2017-06-11 21:10:53 +02:00
alext
a56de244ca Merge branch 'christiaangoossens-master' into develop 2017-06-03 22:11:36 +02:00
Christiaan Goossens
a055b938b2 Improved the Dutch translations
I chose to translate 'provider' with 'medewerker', which means 'someone
who works at your company', because it will make more sense for Dutch
people who try to book an appointment (mostly older people).

I have translated 'any provider' with 'maakt me niet uit', which means:
'I don't care', also to make it easier to understand what that selection
item means for Dutch people.
2017-06-01 12:30:23 +02:00
alext
b568061ffd Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	composer.lock
#	doc/faq.md
#	gulpfile.js
#	src/vendor/autoload.php
#	src/vendor/composer/autoload_real.php
#	src/vendor/composer/installed.json
#	src/vendor/phpmailer/phpmailer/VERSION
#	src/vendor/phpmailer/phpmailer/class.phpmailer.php
#	src/vendor/phpmailer/phpmailer/class.pop3.php
#	src/vendor/phpmailer/phpmailer/class.smtp.php
2017-05-24 23:31:47 +02:00
alext
6e4d333f71 Updated PHPMailer in vendor directory. 2017-05-18 22:10:16 +02:00
alext
8474ef8be2 PHP sessions will be stored in the "storage" directory (fixes #241)
(cherry picked from commit 557c282)
2017-05-18 21:36:15 +02:00
alext
7d76053069 Updated application version label. 2017-05-18 21:34:13 +02:00
alext
f62d95b3e9 Updated years in index.php file. 2017-05-18 21:27:37 +02:00
Scott Arthur
b63e5b3db7 Upgrade to CodeIgniter 3.1.4 2017-03-21 22:28:20 +11:00
alext
a13c339167 Make a JS redirection and not a history replace after successful booking. 2017-03-10 09:25:07 +01:00
alext
1fab63a08b Changed code style 2017-03-10 09:24:27 +01:00
alext
82fea484c0 Do not display read-only google calendars for selection. 2017-03-10 09:23:50 +01:00
alext
34a7277a1e Added try-catch block when activating google cal sync 2017-03-10 09:23:31 +01:00
alext
2dad4dfc34 Updated copyright year. 2017-01-31 07:35:34 +01:00
alext
c2dff6cdcd Removed unnecessary semicolons. 2017-01-21 20:02:38 +01:00
alext
318bfcd990 Corrected french translations. 2016-12-13 21:10:06 +01:00
alext
ce89711af2 Removed old unit test files. 2016-12-07 19:46:15 +01:00
alext
69586b5207 Added new composer file. 2016-12-07 19:45:47 +01:00
alext
6f886d60a5 Removed comments from the end of the files. 2016-12-07 19:45:39 +01:00
alext
9ff11db2e6 Corrected backend/calendars view typo. 2016-12-04 13:09:25 +01:00
alext
60c46cc16d Merge branch 'binou06-patch-1' into develop 2016-12-01 19:45:50 +01:00
binou06
ec532474f5 issue that that prevents the removal of secretary 2016-11-29 20:02:11 +01:00
alext
5a022bb23d Corrected backend secretaries "cancel" button event typo. 2016-11-20 18:56:35 +02:00
alext
2e2cb09a2d Renamed "composer" directory to "composer_modules" and updated its references. 2016-11-13 12:46:02 +01:00
alext
557c282433 PHP sessions will be stored in the "storage" directory (fixes #241) 2016-11-13 12:25:02 +01:00
alext
1d2ffadbd9 Updated version 2016-11-13 12:18:23 +01:00
alext
cf2b787749 Updated documentation link. 2016-11-09 20:36:27 +01:00
alext
79558d7991 Corrected @package phpdoc tag. 2016-11-09 20:15:17 +01:00
alext
3c7c95b0b1 Performed corrections to various codebase issues. 2016-11-09 20:10:27 +01:00
alext
388a079834 Renamed Alphanumeric type class to Text. 2016-11-09 19:56:24 +01:00
alext
ed7e40720e Renamed firstname and lastname to firstName and lastName, also made some other corrections. 2016-11-06 18:30:03 +01:00
alext
652ccbe286 Minor UI modifications in various pages. 2016-11-06 13:15:15 +01:00
alext
d6c3968ba5 Corrected breaks selector for working plan reset. 2016-11-06 12:57:43 +01:00
alext
fad8d3630c Added first name initial of customer in table calendar view. 2016-11-06 12:30:38 +01:00
alext
54ef4e34c2 Corrected rendering issue when table calendar and 3-days view are selected (patched previous fix). 2016-11-06 12:24:21 +01:00
alext
ff796d60f1 Corrected rendering issue when table calendar and 3-days view are selected. 2016-11-06 12:18:02 +01:00
alext
e8a0631bb9 Updated version information. 2016-11-06 11:49:21 +01:00
alext
4d01b2c871 The date navigation buttons need to be disabled while the table is rendering. 2016-11-06 11:44:32 +01:00
alextselegidis
9b6bdc1bd6 There must always be one PHPMailer instance per email (fixes #192). 2016-10-24 22:56:09 +02:00
alextselegidis
8332eecee2 Reversed "getDate" methods for unavailabilities modal. 2016-10-24 00:06:06 +02:00
alextselegidis
e1697ba35e Removed border bottom from datetimepicker widget. 2016-10-23 23:16:44 +02:00
alextselegidis
e6015c253d Updated timepicker addon extension which fixes timezone issues (fixes #220). 2016-10-23 23:12:19 +02:00
alextselegidis
457e59b502 There must always be one PHPMailer instance per email (fixes #192). 2016-10-23 22:32:12 +02: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
alextselegidis
2a775bcfb6 Merge branch 'develop' of https://github.com/p0zi/easyappointments into p0zi-develop 2016-10-23 21:44:57 +02:00
alextselegidis
b7fab97b92 Replaced "getDate" method call with Date.parse (fixes #220). 2016-10-23 21:40:32 +02:00
p0zi
c6c66536bc Merge remote-tracking branch 'upstream/develop' into develop 2016-10-21 02:04:59 +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
81b3eb9bd3 Do not use the "getDate" method of the datepicker as it changes the timezone for dates between the 30nth of October and the 25th of March. 2016-10-20 23:39:25 +02:00
alextselegidis
e6082ab2e0 Removed unnecessary "stripcslashes" method call (fixes #194) 2016-10-20 23:05:43 +02:00
alextselegidis
2c38a2165e Corrected appointment form layout. 2016-10-20 23:00:34 +02:00
alextselegidis
47ba769e62 Corrected translation which was causing problem with delete/cancel buttons (fixes #215). 2016-10-20 22:42:16 +02:00
alextselegidis
202c623be9 Corrections in the bulgarian translation. 2016-10-17 21:58:27 +02:00
alextselegidis
abb6c0e592 Changed section comments style 2016-10-16 20:35:26 +02:00
alextselegidis
aacd760256 Added bulgarian translation. 2016-10-16 20:32:13 +02:00
alextselegidis
ecce8fb1c3 Spelling corrections 2016-10-10 18:29:48 +02:00
alextselegidis
5229ed5767 Renamed engine type classes for PHP7 compatibility (fixes #204). 2016-10-10 17:46:29 +02:00
alextselegidis
9b5428a91d Added dedicated link in backend services page. 2016-10-10 17:20:23 +02:00
alextselegidis
ea55bc54f5 Corrected but with mutiple months navigation in booking wizard. 2016-10-10 16:45:19 +02:00
alextselegidis
1164dcd588 Removed extensions directory (it will be added again with v1.3) 2016-10-10 16:13:45 +02:00
alextselegidis
c3ec123c01 Styling improvements in backend. 2016-10-10 16:00:30 +02:00
alextselegidis
f3c201854a Corrected dedicated icon selector. 2016-10-06 21:10:56 +02:00
alextselegidis
4996dd014a Improved global variables definition in php files. 2016-10-06 21:00:58 +02:00
alextselegidis
ece2374328 Corrected display of working plan in settings page. 2016-10-06 20:40:20 +02:00
alextselegidis
0d25d7322e Corrected styling in backend users page. 2016-10-06 20:39:02 +02:00
alextselegidis
e362e2da4c Updated backend colors. 2016-10-06 20:12:30 +02:00
alextselegidis
1df998114f Updated app version title for upcoming release. 2016-10-06 19:48:16 +02:00
alextselegidis
365f8cf38d Require captcha setting must be disabled by default in new installations. 2016-10-06 19:40:17 +02:00
alextselegidis
9223140a7d Updated the version in config.php file for v1.2.0 Alpha.1 2016-09-07 23:34:36 +02:00
Alex Tselegidis
3348175b91 The sticky table header fix must be applied on single dates as well cause the calendar view width might be larger as well. 2016-08-17 22:40:17 +02:00
Alex Tselegidis
d4360bef80 Added fix for the sticky table headers when horizontally scrolling the calendar view. 2016-08-15 21:59:43 +02:00
Alex Tselegidis
5bb56b8653 Reload only the events markup on table calendar view. 2016-08-15 21:32:31 +02:00
Alex Tselegidis
eef6966798 Show the appointment duration only if its different than the standard value. 2016-08-11 22:56:54 +02:00
Alex Tselegidis
4bd0f3661c Removed the add-appointment-shortcut cause it's not neccessary, users have enough space for 'clicking' in table cells. 2016-08-11 22:50:38 +02:00
Alex Tselegidis
9470c42775 Added shortcut button for adding appointments (easier in touch devices). 2016-08-11 22:43:09 +02:00
Alex Tselegidis
60ff0de1a2 Added more right margin in order to be easier to add appointments from touch devices. 2016-08-11 22:14:12 +02:00
Alex Tselegidis
03db821359 Added fixed table headers in the table calendar view. 2016-08-11 22:08:55 +02:00
Alex Tselegidis
208ca9a3a6 Added jquery sticky table headers to the project. 2016-08-11 21:53:29 +02:00
Alex Tselegidis
25d9424eb5 Load the events every 20 seconds. 2016-08-11 21:27:25 +02:00
Alex Tselegidis
3272beb134 The loading spinner will not be displayed whenever the events are fetched. 2016-08-11 21:24:37 +02:00
Alex Tselegidis
cef87016dc Removed unnecessary comment from table view file and commented out the fixed header styling (not ready yet). 2016-07-25 01:19:17 +02:00
Alex Tselegidis
5b2fcdbee6 Corrected popover title for table view. 2016-07-24 15:10:48 +02:00
Alex Tselegidis
add87db811 Removed unnecessary fullscreen toggling code. 2016-07-24 13:35:08 +02:00
Alex Tselegidis
d78710f60b Added fullscreen toggle button to table view. 2016-07-24 13:26:20 +02:00
Alex Tselegidis
a636d4510a Changed update interval to 15 seconds. 2016-07-24 13:25:54 +02:00
Alex Tselegidis
4e2368c544 Do not display the hour if its the same as the row one (calendar table view). 2016-07-24 11:23:56 +02:00
Alex Tselegidis
7ed43cdad2 Avoid displaying the date in the column container when the user is on single day view. 2016-07-24 11:05:25 +02:00
Alex Tselegidis
4b976c86fe Changed calendar table span option from 4 to 3 days. 2016-07-24 10:56:55 +02:00
Alex Tselegidis
6c064295ca The calendar table events will be automatically refreshed every 1 minute. 2016-07-24 10:55:47 +02:00
Alex Tselegidis
c4f5a26a55 Updated installation scripts with new db columns. 2016-07-24 10:48:57 +02:00
Alex Tselegidis
1f0c10f70a Removed null values for fields that are required. 2016-07-24 10:48:38 +02:00
Alex Tselegidis
3045e34c49 Added new Easy!Appointments links in about page. 2016-07-23 16:30:09 +02:00
Alex Tselegidis
e5c0da55a5 Decreased margins in working plan components. 2016-07-23 16:29:05 +02:00
Alex Tselegidis
511da5b7ce Corrected bootstrap dismiss icon markup. 2016-07-23 16:15:11 +02:00
Alex Tselegidis
d828befb32 Added provider breaks in the table view. 2016-07-23 16:07:20 +02:00
Alex Tselegidis
ee64fdbc8f Added margin-bottom to calenadr events. 2016-07-23 15:32:16 +02:00
Alex Tselegidis
e88ab104be Corrected table view width issue. 2016-07-23 15:30:34 +02:00
Alex Tselegidis
0d966cb0ba The google calendar sync buttons need to be hidden cause they cannot be used in the table view. 2016-07-22 22:10:33 +02:00
Alex Tselegidis
2783310a93 Styling and display corrections in the table view. 2016-07-22 22:06:36 +02:00
Alex Tselegidis
aa14b7eef0 Corrected Google_sync library name. 2016-07-22 21:51:50 +02:00
Alex Tselegidis
2a4e7efbe4 Table view styling improvements. 2016-07-22 21:09:43 +02:00
Alex Tselegidis
8f12b459d0 Integrated the multiple attendants in the availabilities generation (#109). 2016-07-21 22:36:17 +02:00
Alex Tselegidis
6d081ad471 Added 'attendants_number' setting to REST API (#109). 2016-07-21 21:00:38 +02:00
Alex Tselegidis
b35ab3bbe3 The select boxes need to be by default disabled in the services form. 2016-07-21 20:40:53 +02:00
Alex Tselegidis
bc2b3163c6 Added 'attendants_number' translation key (#109). 2016-07-21 20:40:31 +02:00
Alex Tselegidis
081f916bf5 Added attendants number setting in backend services page (#109). 2016-07-21 20:33:43 +02:00
Alex Tselegidis
b873fc92ee Added attendants number field in services page (#109). 2016-07-21 20:30:02 +02:00
Alex Tselegidis
310e472189 UI improvements in the table calendar view. 2016-07-20 22:37:56 +02:00
Alex Tselegidis
bc1b82b7da Corrected Google_sync library loading and made permissions check before returning the table view calendar events. 2016-07-20 22:33:24 +02:00
Alex Tselegidis
f4e4b3eb61 Corrected not-working columns height in table calendar view. 2016-07-20 22:09:28 +02:00
Alex Tselegidis
d5544d0044 Integrated the availabilities type in the booking wizard and API controller (#185). 2016-07-20 22:06:19 +02:00
Alex Tselegidis
4d5b3ecad2 Added 'availabilitiesType' to REST API (#185). 2016-07-20 21:24:00 +02:00
Alex Tselegidis
29a694e5de Integrated availabilities type in backend section (#185). 2016-07-20 21:20:00 +02:00
Alex Tselegidis
c9b6153df5 Added 'flexible' and 'fixed' translation keys. 2016-07-20 21:15:58 +02:00
Alex Tselegidis
bc8c691493 Added new translation key. 2016-07-20 21:09:20 +02:00
Alex Tselegidis
f289455228 Corrected update statement of migration. 2016-07-20 20:48:02 +02:00