Alex Tselegidis 069509c8da Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements ... # Conflicts: # application/views/backend/calendar.php # application/views/backend/settings.php		2020-09-23 15:13:58 +03:00
..
config	Merge pull request #817 from popod/save-customer-language	2020-09-23 13:16:25 +03:00
controllers	Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements	2020-09-23 15:13:58 +03:00
helpers	Use the codeigniter random string generation function for creating random passwords (#680).	2020-09-23 13:16:37 +03:00
language	Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements	2020-09-23 15:13:58 +03:00
libraries	Added more information to the ICS file, sent with the email confirmation.	2020-09-23 14:53:15 +03:00
migrations	Improvements in the user language storage feature.	2020-09-23 13:48:07 +03:00
models	Use the "alnum" method when generating random strings via the codeigniter helper function (generates shorter strings)	2020-09-23 14:37:09 +03:00
views	Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements	2020-09-23 15:13:58 +03:00
.htaccess
index.html