Alex Tselegidis
|
683b7a4d2d
|
Merge pull request #503 from oxteam/patch-1
Fix down procedure for Secretary Provider
|
2020-03-10 20:15:18 +01:00 |
|
Alex Tselegidis
|
3ed85d542c
|
Merge branch 'Caine85-extra-working-days' into develop
|
2020-03-10 20:09:50 +01:00 |
|
Alex Tselegidis
|
7d04052697
|
Merge branch 'extra-working-days' of https://github.com/Caine85/easyappointments into Caine85-extra-working-days
# Conflicts:
# src/application/config/migration.php
# src/application/language/arabic/translations_lang.php
# src/application/language/bulgarian/translations_lang.php
# src/application/language/chinese/translations_lang.php
# src/application/language/danish/translations_lang.php
# src/application/language/dutch/translations_lang.php
# src/application/language/english/translations_lang.php
# src/application/language/finnish/translations_lang.php
# src/application/language/french/translations_lang.php
# src/application/language/german/translations_lang.php
# src/application/language/greek/translations_lang.php
# src/application/language/hindi/translations_lang.php
# src/application/language/hungarian/translations_lang.php
# src/application/language/italian/translations_lang.php
# src/application/language/japanese/translations_lang.php
# src/application/language/luxembourgish/translations_lang.php
# src/application/language/polish/translations_lang.php
# src/application/language/portuguese-br/translations_lang.php
# src/application/language/portuguese/translations_lang.php
# src/application/language/romanian/translations_lang.php
# src/application/language/russian/translations_lang.php
# src/application/language/slovak/translations_lang.php
# src/application/language/spanish/translations_lang.php
# src/application/language/turkish/translations_lang.php
# src/assets/js/general_functions.js
# src/assets/js/working_plan.js
# src/assets/sql/data.sql
|
2020-03-10 20:09:31 +01:00 |
|
Alex Tselegidis
|
4ed023618d
|
Merge branch 'cuchi-update-pt-br' into develop
# Conflicts:
# src/application/language/portuguese-br/translations_lang.php
|
2020-03-09 22:05:49 +01:00 |
|
Alex Tselegidis
|
756d7f33aa
|
Merge branch 'update-pt-br' of https://github.com/cuchi/easyappointments into cuchi-update-pt-br
|
2020-03-09 22:04:39 +01:00 |
|
Kaustubh Kulkarni
|
89b114f2eb
|
added marathi language support
|
2020-03-09 22:03:12 +01:00 |
|
Alex Tselegidis
|
66cf2b8882
|
Merge branch 'athAtp-patch-2' into develop
# Conflicts:
# docker-compose.prod.yml
# docker-compose.yml
|
2020-03-09 21:59:10 +01:00 |
|
Alex Tselegidis
|
9f0114c08b
|
Set values for consent "created" and "modified" columns.
|
2020-03-09 21:53:03 +01:00 |
|
Alex Tselegidis
|
21ab3428a5
|
Merge pull request #556 from PetrTodorov/develop
Add Czech language translation
|
2020-03-09 21:52:37 +01:00 |
|
Alex Tselegidis
|
bd45947a42
|
Merge pull request #522 from oxteam/oxteam-fix_gpdr_sql_backward_comp
Fix MySQL/MariaDB 5.5.x backward compatibility issue with 'ea_consents' table (#518)
|
2020-03-09 21:49:46 +01:00 |
|
Alex Tselegidis
|
a748bf28fd
|
Merge pull request #558 from Caine85/patch-modal-close-buttons-lang
Patch for close buttons language in modal views
|
2020-03-09 21:44:55 +01:00 |
|
Alex Tselegidis
|
274b27d88f
|
Git ignore the .DS_Store files
|
2020-03-09 21:25:22 +01:00 |
|
Alex Tselegidis
|
1e0f61c4e4
|
Merge branch 'develop' of https://github.com/alextselegidis/easyappointments into develop
|
2020-03-09 21:19:32 +01:00 |
|
Alex Tselegidis
|
af296cf147
|
Book advance timeout must span in multiple days (#365, #428).
|
2020-03-09 21:15:03 +01:00 |
|
athAtp
|
631cc01e33
|
Update installation.js
Hello,
Thank you for your work! The installation did not display errors.
|
2020-02-17 03:14:53 +02:00 |
|
alext
|
da98768cd0
|
Unset the provider settings property for the book success page (#664).
|
2019-12-04 09:48:57 +01:00 |
|
Alex Tselegidis
|
0fe96a28d4
|
Merge pull request #555 from PetrTodorov/patch-1
Update README.md
|
2019-07-14 19:08:44 +02:00 |
|
alext
|
14bbd793bf
|
Merged pull request #282 - Added action link icons in the backend calendar page, event popover component.
|
2019-06-08 17:20:49 +02:00 |
|
alext
|
44cd035448
|
Merged pull request #260 - Add 'Location' option to Services [Not a required field]
|
2019-06-08 17:03:32 +02:00 |
|
alext
|
52e17063b7
|
Added location field for services.
|
2019-06-08 16:57:09 +02:00 |
|
alext
|
dfd55d9472
|
Added location field in the appointments API parser.
|
2019-06-08 16:55:44 +02:00 |
|
alext
|
cd365551b9
|
Added .gitattributes
|
2019-06-08 16:50:21 +02:00 |
|
alext
|
62e28d381d
|
Merged pull request #221 - Fixed/Improved sort breaks increasingly by hour within day
|
2019-06-08 16:48:24 +02:00 |
|
alext
|
84afca8b26
|
Integrated location field in the backend section.
|
2019-06-08 16:43:21 +02:00 |
|
alext
|
6f39a99734
|
Switched namespace directory back to its previous state.
|
2019-06-08 16:27:17 +02:00 |
|
alext
|
756f4762a6
|
Added new autoloading directories.
|
2019-06-08 16:20:14 +02:00 |
|
alext
|
cfdb5c6359
|
Included required composer files.
|
2019-06-08 16:08:29 +02:00 |
|
alext
|
812791d0f8
|
Updated gulp dependency.
|
2019-06-08 16:04:36 +02:00 |
|
alext
|
31673436fe
|
Added location field in the database for appointments.
|
2019-06-08 15:56:38 +02:00 |
|
alext
|
cd58d5d07d
|
Added backtrace in debug log entries.
|
2019-01-16 10:03:25 +01:00 |
|
Alex Tselegidis
|
ee24c7b8a7
|
Merge pull request #564 from CalvinMcGee/master
Fixing connection issues to MySQL 8.0.4
|
2018-12-06 19:54:51 +01:00 |
|
alext
|
0c683ad990
|
Added metafile to .gitignore
|
2018-11-30 21:08:36 +01:00 |
|
alext
|
8f3fe8a0c7
|
Updated comment block of composer gulp task.
|
2018-11-10 15:13:36 +01:00 |
|
alext
|
ec07dddb4c
|
Implementation of core engine components.
|
2018-11-10 09:45:20 +01:00 |
|
alext
|
7faa4bf974
|
Added monolog as composer dependency.
|
2018-11-10 09:29:00 +01:00 |
|
alext
|
1e174c29a2
|
Changed path for the addons directory in the autoload configuration.
|
2018-11-09 14:21:52 +01:00 |
|
Joachim Wallsin
|
e0cdb4c048
|
closes alextselegidis/easyappointments#557
Fixing connection issues to MySQL 8.0.4.
|
2018-11-06 09:43:47 +01:00 |
|
alext
|
78362e4cac
|
Updated version information in repo for 1.4.0
|
2018-11-03 17:27:19 +01:00 |
|
alext
|
1178e9e58a
|
Created separate code of conduct document and renamed files back to capital, so that they are easier to find.
|
2018-11-03 17:24:51 +01:00 |
|
alext
|
650fe4e36f
|
Renamed Type directory.
|
2018-11-03 17:16:35 +01:00 |
|
alext
|
a1ae0f3746
|
Updated phpunit tests for phpunit v7
|
2018-11-03 17:10:34 +01:00 |
|
alext
|
9e9565400d
|
Updated phpunit dev dependency to v7
|
2018-11-03 16:29:03 +01:00 |
|
alext
|
333838b635
|
Integrated gulp tasks in for script and style minification.
|
2018-11-03 16:15:52 +01:00 |
|
alext
|
f551bcfd73
|
Renamed docs and tests directories.
|
2018-11-03 15:20:51 +01:00 |
|
alext
|
b33474761e
|
Moved Docker related files into the docker directory.
|
2018-11-03 15:15:20 +01:00 |
|
alext
|
515b6b4c46
|
Converted root document files to lowercase.
|
2018-11-03 14:40:54 +01:00 |
|
alext
|
725edfb6ca
|
Move rsc contents to doc directory and updated gulp doc task.
|
2018-11-03 14:40:00 +01:00 |
|
alext
|
01b0bc3fa3
|
Add "addons" to PSR autoloading configuration (#561).
|
2018-11-03 14:37:46 +01:00 |
|
alext
|
226f74ad6d
|
Updated to CodeIgniter v3.1.9
|
2018-11-02 15:26:12 +01:00 |
|
Caine85
|
f4a6d2bf59
|
Update terms_and_conditions_modal.php
|
2018-10-23 20:03:08 +02:00 |
|