Commit graph

984 commits

Author SHA1 Message Date
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
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
565332995f Merge branch 'PatchworkBoy-patch-1' into develop 2017-07-15 17:14:22 +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
b1b6b5f62a Corrected user_settings column size. 2017-07-10 10:17:17 +02:00
alext
e8d9e49cfd Removed comment keyword from ea_roles table definition. 2017-07-10 10:16:30 +02: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
6c28b4c68f Merge branch 'Valian-develop' into develop 2017-06-17 12:53:28 +02:00
alext
0cb097f3f7 Corrected gitignore file. 2017-06-16 08:59:28 +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
b22240e38e Updated gulpfile 2017-06-11 21:46:30 +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
8e3cbd67cb Merge branch 'develop' of https://github.com/Valian/easyappointments into Valian-develop 2017-05-23 15:10:49 +02:00
Valian
2d3e03f54c Docker image based on official PHP-apache distribution. Some configuration tweaks to support it 2017-05-21 13:53:14 +02:00
alext
0fc36007c3 Corrected source link in composer.json 2017-05-21 12:52:59 +02:00
alext
d79ff1a5ce Added minimum-stability in composer.json 2017-05-21 12:52:26 +02:00