Peter Papp 737adfa91a Merge remote-tracking branch 'origin/master' into oasis ...

# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json

2021-04-06 10:02:20 +02:00

..

Oasis

- payment for subscription frontend

2021-03-23 11:12:41 +01:00

File.php

Merge remote-tracking branch 'origin/version-1.8.3' into v2

2021-03-27 12:12:42 +01:00

Folder.php

Language editor refactoring part 2 (backend + frontend)

2021-03-28 14:06:16 +02:00

Invoice.php

- implement factories into models

2021-02-26 17:57:21 +01:00

Language.php

- added function to upgrade language translations

2021-04-06 09:56:11 +02:00

LanguageTranslation.php

- added function to upgrade language translations

2021-04-06 09:56:11 +02:00

Page.php

added it_get_all_pages, it_get_page, it_update_page test

2021-03-05 11:02:13 +01:00

Setting.php

Language editor refactoring part 4 (backend + frontend)

2021-04-01 10:40:48 +02:00

Share.php

- public sharing refactored part 2

2021-03-19 09:04:18 +01:00

Traffic.php

- implement factories into models

2021-02-26 17:57:21 +01:00

User.php

Merge remote-tracking branch 'origin/v2' into oasis

2021-04-01 10:45:10 +02:00

UserSettings.php

added it_get_user_invoices test

2021-03-04 14:15:07 +01:00

Zip.php

added it_zip_shared_multiple_files_and_download_it, it_try_zip_non_shared_file_with_shared_multiple_files_and_download_it test

2021-03-10 10:02:44 +01:00