James Cole 9ffc0936ee Merge branch 'feature/new-csv-import' into develop ...

# Conflicts:
#	app/Helpers/Csv/Importer.php

2016-06-23 12:15:19 +02:00

..

Bootstrap

Copyright notices. [skip ci]

2016-05-20 12:27:31 +02:00

Console

Fix bug in verification.

2016-05-20 15:08:24 +02:00

Crud

Fix delete routine and some NULLs

2016-06-23 12:07:31 +02:00

Events

Copyright notices. [skip ci]

2016-05-20 12:27:31 +02:00

Exceptions

Copyright notices. [skip ci]

2016-05-20 12:27:31 +02:00

Export

Remove all code related to the CSV importer in preparation of #262

2016-05-22 20:18:16 +02:00

Generator/Chart

Merge branch 'release/3.9.0'

2016-05-22 16:46:11 +02:00

Handlers/Events

Small updates for 3.9.1

2016-06-06 20:25:01 +02:00

Helpers

Merge branch 'feature/new-csv-import' into develop

2016-06-23 12:15:19 +02:00

Http

Merge branch 'feature/new-csv-import' into develop

2016-06-23 12:15:19 +02:00

Import

Translations and fixes.

2016-06-11 06:31:40 +02:00

Jobs

Copyright notices. [skip ci]

2016-05-20 12:41:23 +02:00

Listeners

Some code cleanup.

2016-01-29 07:17:50 +01:00

Models

Merge branch 'feature/new-csv-import' into develop

2016-06-23 12:15:19 +02:00

Policies

Some code cleanup.

2016-01-29 07:17:50 +01:00

Providers

Merge branch 'feature/new-csv-import' into develop

2016-06-23 12:15:19 +02:00

Repositories

Merge branch 'feature/new-csv-import' into develop

2016-06-23 12:15:19 +02:00

Rules

Copyright notices. [skip ci]

2016-05-20 12:41:23 +02:00

Support

Change preferences info.

2016-06-23 12:08:14 +02:00

Validation

Copyright notices. [skip ci]

2016-05-20 12:42:21 +02:00

User.php

Initial code base for new CSV import.

2016-06-10 21:00:00 +02:00