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

1164 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
alext
4b0e6b7f2f Updated composer configuration. 2017-05-21 12:47:34 +02:00
alext
757556f849 Merge branch 'hotfix-codeigniter-upgrade' 2017-05-21 11:38:48 +02:00
alext
4cc0d4417d Do not remove .htaccess from /storage/logs directory. 2017-05-21 11:37:24 +02:00
alext
6e4d333f71 Updated PHPMailer in vendor directory. 2017-05-18 22:10:16 +02:00
alext
3ea329f89a Updated PHPMailer depedency. 2017-05-18 22:00:38 +02:00
alext
2fa2dd3ec1 Updated version in package.json. 2017-05-18 21:57:49 +02:00
alext
a59726a993 Updated the documentation for v1.2.1 2017-05-18 21:57:07 +02:00
alext
4ffc4aa6fd Updated CHANGELOG.md for v1.2.1 2017-05-18 21:39:05 +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
alext
b56207b387 Added CONTRIBUTING.md 2017-05-17 21:40:03 +02:00
alext
2920468664 Removed yarn.lock file (use npm instead). 2017-05-17 14:57:52 +02:00
alext
d44128389c Updating license file (GPL-3.0) 2017-05-17 14:57:20 +02:00
alext
18571975f1 Removed AUTO_INCREMENT offsets. 2017-05-07 21:27:21 +02:00
Valian
547bad01f1 email settings as ENV variables inside Docker containers 2017-04-23 13:22:09 +02:00
Valian
4bebdf4bec updated readme 2017-04-21 12:13:03 +02:00
Valian
2a6188d79d Development and production docker configuration 2017-04-21 12:07:45 +02:00
Scott Arthur
22de7e46dd Update minimum recommended PHP version in install docs 
CodeIgniter 3.1.0 suggests this although lesser versions might work.

See https://www.codeigniter.com/user_guide/installation/upgrade_310.html#step-2-check-your-php-version
 2017-03-21 22:47:51 +11:00
Scott Arthur
b63e5b3db7 Upgrade to CodeIgniter 3.1.4 2017-03-21 22:28:20 +11:00