mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-12-23 15:12:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
1342 commits 3 branches 40 tags 58 MiB
Commit graph

1342 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
alext
19725ec4e9 Merge branch 'master' into develop 2017-03-17 10:25:10 +01:00
Alex Tselegidis
90d85f5aa7 Updated banner URL 2017-03-17 08:47:54 +01: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
8f974150c5 Merge branch 'davidjosephhayes-master' into develop 2017-02-15 19:53:05 +01:00
David Hayes
bb8b51a279 fix html typo 2017-02-06 19:06:00 -06: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
3d2701615b Added Docker documentation. 2017-01-16 23:46:59 +01:00
alext
5075310289 Merge branch 'rankun203-feature-docker-compose' into develop 2017-01-16 23:33:54 +01:00
alext
ac01f41ab7 Edited docker configuration. 2017-01-16 23:33:27 +01:00
alext
318bfcd990 Corrected french translations. 2016-12-13 21:10:06 +01:00
alext
926b26f23c Merge branch 'feature-docker-compose' of https://github.com/rankun203/easyappointments into rankun203-feature-docker-compose 2016-12-07 19:52:15 +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
Kun Ran
e1ee54c7fe Remove unsafe ports 2016-12-03 10:33:56 +08: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