Author |
Committer |
Branch |
Timestamp |
Parent |
|
frank |
frank |
master |
2014-01-20 14:38 |
master 04427cb7 |
Pending |
Changeset |
Merge branch 'barbossa-0.0.1' |
mod - README.md |
Diff File |
mod - composer.lock |
Diff File |
mod - composer.phar |
Diff File |
mod - config/application.config.php |
Diff File |
mod - module/Admin/view/admin/admin/index.phtml |
Diff File |
mod - module/Admin/view/admin/admin/roles.phtml |
Diff File |
mod - module/Admin/view/admin/admin/users.phtml |
Diff File |
mod - module/Application/config/module.config.php |
Diff File |
mod - module/Application/view/layout/layout.phtml |
Diff File |
mod - module/Client/src/Client/Controller/ClientController.php |
Diff File |
mod - module/Client/src/Client/Model/ClientTable.php |
Diff File |
mod - module/Client/view/client/client/details.phtml |
Diff File |
mod - module/Client/view/client/client/index.phtml |
Diff File |
mod - module/Dashboard/src/Dashboard/Controller/DashboardController.php |
Diff File |
mod - module/Dashboard/view/dashboard/dashboard/index.phtml |
Diff File |
mod - module/Director/src/Director/Controller/DirectorController.php |
Diff File |
mod - module/Director/view/director/director/index.phtml |
Diff File |
mod - module/Director/view/director/director/messages.phtml |
Diff File |
mod - module/Director/view/director/director/scheduler.phtml |
Diff File |
mod - module/Director/view/director/director/version.phtml |
Diff File |
mod - module/File/view/file/file/index.phtml |
Diff File |
mod - module/File/view/file/file/jobid.phtml |
Diff File |
mod - module/File/view/file/file/revisions.phtml |
Diff File |
mod - module/Fileset/src/Fileset/Controller/FilesetController.php |
Diff File |
mod - module/Fileset/src/Fileset/Model/FilesetTable.php |
Diff File |
mod - module/Fileset/view/fileset/fileset/details.phtml |
Diff File |
mod - module/Fileset/view/fileset/fileset/index.phtml |
Diff File |
mod - module/Job/src/Job/Controller/JobController.php |
Diff File |
mod - module/Job/src/Job/Model/JobTable.php |
Diff File |
mod - module/Job/view/job/job/details.phtml |
Diff File |
mod - module/Job/view/job/job/index.phtml |
Diff File |
add - module/Job/view/job/job/problem.phtml |
Diff File |
mod - module/Job/view/job/job/running.phtml |
Diff File |
mod - module/Job/view/job/job/timeline.phtml |
Diff File |
add - module/Job/view/job/job/waiting.phtml |
Diff File |
mod - module/Log/view/log/log/details.phtml |
Diff File |
mod - module/Log/view/log/log/index.phtml |
Diff File |
mod - module/Log/view/log/log/job.phtml |
Diff File |
mod - module/Media/view/media/media/details.phtml |
Diff File |
mod - module/Media/view/media/media/index.phtml |
Diff File |
mod - module/Pool/view/pool/pool/details.phtml |
Diff File |
mod - module/Pool/view/pool/pool/index.phtml |
Diff File |
add - module/Restore/Module.php |
Diff File |
add - module/Restore/autoload_classmap.php |
Diff File |
add - module/Restore/config/module.config.php |
Diff File |
add - module/Restore/src/Restore/Controller/RestoreController.php |
Diff File |
add - module/Restore/src/Restore/Model/Restore.php |
Diff File |
add - module/Restore/src/Restore/Model/RestoreTable.php |
Diff File |
add - module/Restore/view/restore/restore/index.phtml |
Diff File |
add - module/Statistics/Module.php |
Diff File |
add - module/Statistics/autoload_classmap.php |
Diff File |
add - module/Statistics/config/module.config.php |
Diff File |
add - module/Statistics/src/Statistics/Controller/StatisticsController.php |
Diff File |
add - module/Statistics/src/Statistics/Model/Statistics.php |
Diff File |
add - module/Statistics/src/Statistics/Model/StatisticsTable.php |
Diff File |
add - module/Statistics/view/statistics/statistics/backupjob.phtml |
Diff File |
add - module/Statistics/view/statistics/statistics/catalog.phtml |
Diff File |
add - module/Statistics/view/statistics/statistics/client.phtml |
Diff File |
add - module/Statistics/view/statistics/statistics/index.phtml |
Diff File |
add - module/Statistics/view/statistics/statistics/stored.phtml |
Diff File |
mod - module/Storage/view/storage/storage/details.phtml |
Diff File |
mod - module/Storage/view/storage/storage/index.phtml |
Diff File |
add - module/User/Module.php |
Diff File |
add - module/User/autoload_classmap.php |
Diff File |
add - module/User/config/module.config.php |
Diff File |
add - module/User/src/User/Controller/UserController.php |
Diff File |
add - module/User/src/User/Model/User.php |
Diff File |
add - module/User/src/User/Model/UserTable.php |
Diff File |
add - module/User/view/user/user/index.phtml |
Diff File |
add - public/img/bareos.png |
Diff File |
mod - public/img/favicon.ico |
Diff File |
add - public/js/jqplot.barRenderer.js |
Diff File |
add - public/js/jqplot.barRenderer.min.js |
Diff File |
add - public/js/jqplot.categoryAxisRenderer.js |
Diff File |
add - public/js/jqplot.categoryAxisRenderer.min.js |
Diff File |
add - public/js/jqplot.pointLabels.js |
Diff File |
add - public/js/jqplot.pointLabels.min.js |
Diff File |
add - tests/AdminTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/ClientTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/ClientTest/Model/ClientTableTest.php |
Diff File |
add - tests/DashboardTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/DirectorTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/FileTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/FileTest/Model/FileTableTest.php |
Diff File |
add - tests/FilesetTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/FilesetTest/Model/FilesetTableTest.php |
Diff File |
add - tests/LogTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/LogTest/Model/LogTableTest.php |
Diff File |
add - tests/MediaTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/MediaTest/Model/MediaTableTest.php |
Diff File |
add - tests/PoolTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/PoolTest/Model/PoolTableTest.php |
Diff File |
add - tests/RestoreTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/Statistics/Controller/IndexControllerTest.php |
Diff File |
add - tests/StorageTest/Controller/IndexControllerTest.php |
Diff File |
add - tests/StorageTest/Model/StorageTableTest.php |
Diff File |
add - tests/UserTest/Controller/IndexControllerTest.php |
Diff File |
mod - tests/phpunit.xml |
Diff File |