This repository has been archived on 2026-07-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Yuri Kuznetsov 0a1322843f Fix conflicts on merge with hotfix/2.7.1

2014-11-25 17:48:38 +02:00

..

Api

minor improvements

2014-11-21 16:10:25 +02:00

Authentication

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Database

Merge branch 'hotfix/2.7.1'

2014-11-21 18:19:39 +02:00

File

fileManager improvements

2014-11-25 17:37:16 +02:00

Log/Monolog

Extension Manager improvements

2014-10-30 13:04:49 +02:00

Metadata

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Auth.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Autoload.php

addded autoload.json for Resources

2014-11-25 16:44:50 +02:00

Config.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Crypt.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

DateTime.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

FieldManager.php

ability to edit translated options

2014-11-04 12:24:52 +02:00

Json.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Language.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Layout.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Log.php

fixed monolog errors

2014-03-20 18:06:35 +02:00

Metadata.php

metedata improvements

2014-11-18 13:36:37 +02:00

PasswordHash.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Route.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

System.php

replace tabs with spaces

2014-10-20 11:13:16 +03:00

Util.php

fixed merge with empty arrays

2014-11-25 12:20:41 +02:00