ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity
1082 commits 2 branches 38 tags 38 MiB
Commit graph

864 commits

Author SHA1 Message Date
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