Alex Tselegidis
|
81cfe6a16d
|
Replaced echo statements with php's shortcode syntax
|
2020-08-31 13:32:58 +03:00 |
|
Alex Tselegidis
|
8f618c3339
|
Miscellaneous fixes on view files, required after merging the bootstrap 4 codebase
|
2020-08-31 13:23:10 +03:00 |
|
Alex Tselegidis
|
6cbb13dc2d
|
Replaced the CDN fontawesome version with a local one.
|
2020-08-15 18:55:35 +03:00 |
|
Alex Tselegidis
|
4cc4437dad
|
Merge branch 'bootstrap-4-and-fontawesome' of https://github.com/janinavelasco9/easyappointments into janinavelasco9-bootstrap-4-and-fontawesome
# Conflicts:
# application/views/backend/calendar.php
# assets/js/backend_calendar_extra_periods_modal.js
# assets/js/backend_customers_helper.js
|
2020-08-15 18:41:14 +03:00 |
|
Alex Tselegidis
|
fc392e3ccf
|
Merge pull request #777 from popod/fix-dropdown-disable
Fix disabled bug with insert dropdown in backend.
|
2020-08-15 16:08:45 +03:00 |
|
Alex Tselegidis
|
6348b1af56
|
Merge pull request #778 from popod/fix-service-details-display-in-booking-page
Fix display of service details when the service change in the booking process
|
2020-08-15 16:07:02 +03:00 |
|
Alex Tselegidis
|
65d3243986
|
Add the appointment has in the stored "dest_url" value when trying to access the calendar page without being logged in first (#804).
|
2020-08-15 15:58:17 +03:00 |
|
Alex Tselegidis
|
dbc45f6b27
|
Do not allow appointments being created with duration less than the predefined minimum (#805).
|
2020-08-15 15:58:17 +03:00 |
|
Alex Tselegidis
|
4f1c39b564
|
Consider the book advance timeout when generating unavailable dates (#855).
|
2020-08-15 15:58:17 +03:00 |
|
Alex Tselegidis
|
177375e814
|
Merge pull request #784 from idstam/swedish-translation
Swedish translations
|
2020-08-15 15:58:06 +03:00 |
|
Alex Tselegidis
|
39a12a593f
|
Merge branch 'spanish-translation-mejora' of https://github.com/rulosant/easyappointments into rulosant-spanish-translation-mejora
|
2020-08-15 14:22:30 +03:00 |
|
Janina Phillips
|
33e11291bc
|
Merge branch 'develop' into bootstrap-4-and-fontawesome
|
2020-07-19 18:56:51 -04:00 |
|
Janina Phillips
|
b6391ab668
|
fix calendar height to just adjust depending on the content and other fixes
|
2020-07-01 09:02:11 -04:00 |
|
Alex Tselegidis
|
d8a7318c95
|
Added missing response variable
|
2020-07-01 10:16:09 +02:00 |
|
Sébastien
|
a4056eb50b
|
Fix some modal title and "close" button display
|
2020-06-29 15:31:59 +02:00 |
|
Sébastien
|
e87ef4a4c1
|
Remove old "glyphicon" icons.
|
2020-06-29 15:23:51 +02:00 |
|
Sébastien
|
58ad2e43a1
|
Fix "for" property for "accept to provacy policy" checkbox label in appointment process.
|
2020-06-29 15:04:41 +02:00 |
|
Janina Phillips
|
63072ead77
|
fix some bugs
|
2020-06-19 11:17:31 -04:00 |
|
Sébastien
|
101316a72f
|
Fix: replace invisible class by d-none.
|
2020-06-19 13:13:08 +02:00 |
|
Sébastien
|
655cafbfc5
|
Unify btn styling on users page
|
2020-06-19 13:11:25 +02:00 |
|
Sébastien
|
81934f2d90
|
Fix: replace all btn-default class by btn-light.
|
2020-06-19 13:09:22 +02:00 |
|
Sébastien
|
1fa749d16b
|
Fix: replace all label class by badge.
|
2020-06-19 12:48:18 +02:00 |
|
Janina Phillips
|
1e855182bd
|
hidden is now d-none
|
2020-06-18 14:37:11 -04:00 |
|
Janina Phillips
|
1bd2647b77
|
fix some icons and styles
|
2020-06-18 14:23:16 -04:00 |
|
Sébastien
|
0b3d97ff1f
|
Fix loading item always displayed on the installationn page.
|
2020-06-17 16:42:29 +02:00 |
|
Alex Tselegidis
|
e857d3a37e
|
Corrected issue with attendants number query
|
2020-06-14 10:56:35 +02:00 |
|
Janina Phillips
|
2dc94f30c7
|
Merge branch 'develop' into bootstrap-4-and-fontawesome
|
2020-06-09 10:36:54 -04:00 |
|
Alex Tselegidis
|
1821e50116
|
Added catalan translations to the app (thanks to Marc Folch)
|
2020-06-04 12:57:14 +02:00 |
|
Johan Idstam
|
8236b39e84
|
Swedish for translations_lang.php
|
2020-05-18 21:44:03 +02:00 |
|
Johan Idstam
|
9996b38e1e
|
Swedish for migration_lang.php
|
2020-05-18 20:10:40 +02:00 |
|
Johan Idstam
|
2b561122a7
|
Add Swedish to config
|
2020-05-18 20:07:45 +02:00 |
|
Johan Idstam
|
c82df14ba0
|
Swedish for email_lang.php
|
2020-05-18 20:07:08 +02:00 |
|
Johan Idstam
|
d5605a00f1
|
Swedish for db_lang.php
|
2020-05-18 19:58:17 +02:00 |
|
Sébastien
|
3c85c420c5
|
Fix sercice details display on booking page.
|
2020-05-15 15:06:08 +02:00 |
|
Alex Tselegidis
|
d2745feb4d
|
Added missing index.html files in the application/views directory.
|
2020-05-12 21:01:06 +02:00 |
|
Alex Tselegidis
|
46d1f745ee
|
Added boilerplate code for the new notifications library.
|
2020-05-12 20:59:29 +02:00 |
|
Alex Tselegidis
|
de4054dd56
|
Removed unnecessary scripts from backend templates.
|
2020-05-12 20:59:29 +02:00 |
|
Alex Tselegidis
|
df44f72964
|
The timezones model got converted into a library (as there is no direct database table to manage).
|
2020-05-12 20:59:29 +02:00 |
|
Alex Tselegidis
|
c48a74e037
|
Imported the Google API Client with composer (old files are no longer needed).
|
2020-05-12 20:59:28 +02:00 |
|
Alex Tselegidis
|
70948615df
|
Added polyfill script for backwards compatibility.
|
2020-05-12 20:59:28 +02:00 |
|
Alex Tselegidis
|
b2464deb78
|
Explicitly define the view in the view toggler href attribute.
|
2020-05-12 20:59:28 +02:00 |
|
Sébastien
|
779b291281
|
Fix disabled bug with insert dropdown in backend.
|
2020-05-09 23:29:16 +02:00 |
|
Mastej, Matt
|
f2b97402fd
|
bootstrap 4 and font awesome
|
2020-05-07 10:34:23 -04:00 |
|
Alex Tselegidis
|
466a3a3c20
|
Removed typo
|
2020-05-06 19:14:29 +02:00 |
|
Alex Tselegidis
|
07276d46a6
|
Code changes on automatically end_datetime assignment via the REST API
|
2020-05-04 20:59:37 +02:00 |
|
Alex Tselegidis
|
5269f73bab
|
Merge pull request #751 from popod/api-appointments-populate-end-datetime
Automatically populate the appointment end datetime based on service duration in API
|
2020-05-04 20:57:15 +02:00 |
|
Alex Tselegidis
|
b56073c071
|
Group insert buttons in the backend calendar to a button dropdown so that more space is available in the toolbar.
|
2020-05-04 13:56:23 +02:00 |
|
Alex Tselegidis
|
10ed734139
|
Removed text from calendar reload button (icon is clear enough).
|
2020-05-04 13:39:12 +02:00 |
|
Alex Tselegidis
|
4635af5094
|
Added quick toggle view button in backend calendar page.
|
2020-05-04 13:38:28 +02:00 |
|
Alex Tselegidis
|
01cf72c6a6
|
Added the select2 library in backend pages.
|
2020-05-04 11:33:35 +02:00 |
|