← Back to branch summary

~xibo-maintainers/xibo/release22

~xibo-maintainers/xibo/release22

Viewing all changes in revision 698.1.72.

Committer: GitHub
Author(s): Dan Garner
Date: 2019-08-22 11:49:37 UTC
mfrom: (698.38.8)
mto: (698.63.2)
mto: This revision was merged to the branch mainline in revision 710.
Revision ID: git-v1:725b35f23dd9cf0788662e379882b18976616a40

Merge pull request #661 from dasgarner/develop

Prep 2.1.0

files added:
tests/resources/RemoteDataSet.json

files modified:
Dockerfile

Dockerfile.ci

Dockerfile.dev

README.md

cypress.json

cypress/integration/dashboard_spec.js

cypress/integration/layout_designer_populated_spec.js

cypress/integration/layout_designer_spec.js

cypress/integration/layout_view_spec.js

cypress/integration/login_spec.js

cypress/integration/modules_spec.js

cypress/integration/playlist_editor_spec.js

cypress/integration/playlists_spec.js

cypress/integration/unauthed_spec.js

cypress/support/commands.js

cypress/support/index.js

docker/entrypoint.sh

docker/etc/periodic/15min/cms-db-backup

lib/Controller/Library.php

lib/Controller/Maintenance.php

lib/Controller/Module.php

lib/Controller/Playlist.php

lib/Controller/User.php

lib/Entity/DisplayProfile.php

lib/Entity/ReportSchedule.php

lib/Entity/Tag.php

lib/Entity/User.php

lib/Entity/Widget.php

lib/Factory/LayoutFactory.php

lib/Factory/MediaFactory.php

lib/Helper/Environment.php

lib/Middleware/State.php

lib/Widget/Audio.php

lib/Widget/Chart.php

lib/Widget/Clock.php

lib/Widget/Currencies.php

lib/Widget/DataSetTicker.php

lib/Widget/DataSetView.php

lib/Widget/Embedded.php

lib/Widget/ForecastIo.php

lib/Widget/GoogleTraffic.php

lib/Widget/Hls.php

lib/Widget/Image.php

lib/Widget/LocalVideo.php

lib/Widget/NotificationView.php

lib/Widget/Pdf.php

lib/Widget/ShellCommand.php

lib/Widget/Stocks.php

lib/Widget/Text.php

lib/Widget/Ticker.php

lib/Widget/Twitter.php

lib/Widget/TwitterMetro.php

lib/Widget/Video.php

lib/Widget/VideoIn.php

lib/Widget/WebPage.php

lib/XTR/MaintenanceRegularTask.php

lib/Xmds/Soap.php

lib/Xmds/Soap4.php

lib/Xmds/Soap5.php

locale/default.pot

locale/es.mo

locale/it.mo

locale/nl.mo

modules/subplaylist-designer-javascript.twig

package-lock.json

package.json

tests/integration/DataSetTest.php

ui/src/core/xibo-cms.js

ui/src/core/xibo-forms.js

ui/src/css/designer.less

ui/src/css/mixins.less

ui/src/designer/main.js

ui/src/designer/region.js

ui/src/preview/html-preview.js

ui/src/templates/form-helpers-sub-playlist-form.hbs

ui/src/templates/navigator-region.hbs

ui/src/templates/toolbar.hbs

views/authed.twig

views/display-form-edit.twig

views/display-page.twig

views/displayprofile-form-edit-android.twig

views/displayprofile-form-edit-linux.twig

views/displayprofile-form-edit-soc.twig

views/displayprofile-form-edit-windows.twig

views/layout-designer-page.twig

views/layout-form-background.twig

views/playersoftware-form-edit.twig

views/region-designer-javascript.twig

views/settings-page.twig

views/user-form-preferences.twig

views/user-welcome.twig

web/swagger.json

Show diffs side-by-side

added added

removed removed

cypress/integration/dashboard_spec.js

cypress/integration/layout_designer_populated_spec.js

cypress/integration/layout_designer_spec.js

cypress/integration/layout_view_spec.js

cypress/integration/login_spec.js

cypress/integration/modules_spec.js

cypress/integration/playlist_editor_spec.js

cypress/integration/playlists_spec.js

cypress/integration/unauthed_spec.js

cypress/support/commands.js

cypress/support/index.js

docker/entrypoint.sh

docker/etc/periodic/15min/cms-db-backup

lib/Controller/Library.php

lib/Controller/Maintenance.php

lib/Controller/Module.php

lib/Controller/Playlist.php

lib/Controller/User.php

lib/Entity/DisplayProfile.php

lib/Entity/ReportSchedule.php

lib/Entity/Tag.php

lib/Entity/User.php

lib/Factory/LayoutFactory.php

lib/Factory/MediaFactory.php

lib/Helper/Environment.php

lib/Middleware/State.php

lib/XTR/MaintenanceRegularTask.php

lib/Xmds/Soap.php

lib/Xmds/Soap4.php

lib/Xmds/Soap5.php

locale/default.pot

modules/subplaylist-designer-javascript.twig

package-lock.json

tests/integration/DataSetTest.php

tests/resources/RemoteDataSet.json

ui/src/core/xibo-cms.js

ui/src/core/xibo-forms.js

ui/src/css/designer.less

ui/src/css/mixins.less

ui/src/designer/main.js

ui/src/designer/region.js

ui/src/preview/html-preview.js

ui/src/templates/form-helpers-sub-playlist-form.hbs

ui/src/templates/navigator-region.hbs

views/authed.twig

views/display-form-edit.twig

views/display-page.twig

views/displayprofile-form-edit-android.twig

views/displayprofile-form-edit-linux.twig

views/displayprofile-form-edit-soc.twig

views/displayprofile-form-edit-windows.twig

views/layout-designer-page.twig

views/layout-form-background.twig

views/playersoftware-form-edit.twig

views/region-designer-javascript.twig

views/settings-page.twig

views/user-form-preferences.twig

views/user-welcome.twig

web/swagger.json

Older »