1c0458b7aa
Removed test view file.
2017-06-29 00:12:59 +02:00
54897e8a3f
Correct post-filtering selection for services.
2017-06-25 20:43:17 +02:00
1e88d37879
Suppress Google Syncing exception whenever a Google Calendar event is not found.
2017-06-23 09:53:22 +02:00
aff86bd021
Refactored structure.sql
2017-06-19 09:46:06 +02:00
358ecbfc9e
Corrected charset of db table.
2017-06-18 19:36:45 +02:00
78d07b91a1
Removed initial auto increment offsets.
2017-06-18 19:26:34 +02:00
9f89aed556
Move initial installation entries to data.sql
2017-06-18 18:30:12 +02:00
04dfc6a7e9
Added max length value to back-end users page.
2017-06-17 18:54:09 +02:00
6c28b4c68f
Merge branch 'Valian-develop' into develop
2017-06-17 12:53:28 +02:00
0cb097f3f7
Corrected gitignore file.
2017-06-16 08:59:28 +02:00
fe5341a0af
Changed message buttons in order to avoid issues with invalid translations.
2017-06-16 08:51:05 +02:00
32d4cf8bf2
Corrected column class.
2017-06-14 09:07:41 +02:00
7b682e5c16
Updated gulp composer task and files.
2017-06-11 21:52:13 +02:00
bda091449c
Updated gitignore
2017-06-11 21:51:36 +02:00
b22240e38e
Updated gulpfile
2017-06-11 21:46:30 +02:00
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
2777be03da
Dedicated service or provider selections must not be disabled.
2017-06-11 21:10:53 +02:00
a56de244ca
Merge branch 'christiaangoossens-master' into develop
2017-06-03 22:11:36 +02:00
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
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
8e3cbd67cb
Merge branch 'develop' of https://github.com/Valian/easyappointments into Valian-develop
2017-05-23 15:10:49 +02:00
2d3e03f54c
Docker image based on official PHP-apache distribution. Some configuration tweaks to support it
2017-05-21 13:53:14 +02:00
0fc36007c3
Corrected source link in composer.json
2017-05-21 12:52:59 +02:00
d79ff1a5ce
Added minimum-stability in composer.json
2017-05-21 12:52:26 +02:00
4b0e6b7f2f
Updated composer configuration.
2017-05-21 12:47:34 +02:00
757556f849
Merge branch 'hotfix-codeigniter-upgrade'
2017-05-21 11:38:48 +02:00
4cc0d4417d
Do not remove .htaccess from /storage/logs directory.
2017-05-21 11:37:24 +02:00
6e4d333f71
Updated PHPMailer in vendor directory.
2017-05-18 22:10:16 +02:00
3ea329f89a
Updated PHPMailer depedency.
2017-05-18 22:00:38 +02:00
2fa2dd3ec1
Updated version in package.json.
2017-05-18 21:57:49 +02:00
a59726a993
Updated the documentation for v1.2.1
2017-05-18 21:57:07 +02:00
4ffc4aa6fd
Updated CHANGELOG.md for v1.2.1
2017-05-18 21:39:05 +02:00
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
7d76053069
Updated application version label.
2017-05-18 21:34:13 +02:00
f62d95b3e9
Updated years in index.php file.
2017-05-18 21:27:37 +02:00
b56207b387
Added CONTRIBUTING.md
2017-05-17 21:40:03 +02:00
2920468664
Removed yarn.lock file (use npm instead).
2017-05-17 14:57:52 +02:00
d44128389c
Updating license file (GPL-3.0)
2017-05-17 14:57:20 +02:00
18571975f1
Removed AUTO_INCREMENT offsets.
2017-05-07 21:27:21 +02:00
547bad01f1
email settings as ENV variables inside Docker containers
2017-04-23 13:22:09 +02:00
4bebdf4bec
updated readme
2017-04-21 12:13:03 +02:00
2a6188d79d
Development and production docker configuration
2017-04-21 12:07:45 +02:00
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
b63e5b3db7
Upgrade to CodeIgniter 3.1.4
2017-03-21 22:28:20 +11:00
19725ec4e9
Merge branch 'master' into develop
2017-03-17 10:25:10 +01:00
90d85f5aa7
Updated banner URL
2017-03-17 08:47:54 +01:00
a13c339167
Make a JS redirection and not a history replace after successful booking.
2017-03-10 09:25:07 +01:00
1fab63a08b
Changed code style
2017-03-10 09:24:27 +01:00
82fea484c0
Do not display read-only google calendars for selection.
2017-03-10 09:23:50 +01:00
34a7277a1e
Added try-catch block when activating google cal sync
2017-03-10 09:23:31 +01:00
alext
Christiaan Goossens
Valian
Scott Arthur