[stable9] Delay reloading the page if an ajax error occurs, show notification #25035

Merged
merged 2 commits into from Jun 9, 2016

Projects

None yet

4 participants

@PVince81
Collaborator
PVince81 commented Jun 8, 2016

Backport of #24126 to stable9

Please review @rullzer @nickvergessen @owncloud/javascript

Xenopathic added some commits Apr 20, 2016
@Xenopathic @PVince81 Xenopathic Delay reloading the page if an ajax error occurs, show notification 40f066a
@Xenopathic @PVince81 Xenopathic Add test for reload delay
3f16ce7
@PVince81 PVince81 added this to the 9.0.3-current-maintenance milestone Jun 8, 2016
@PVince81
Collaborator
PVince81 commented Jun 8, 2016

For #24309

@nickvergessen
Contributor

👍 makes sense

@PVince81
Collaborator
PVince81 commented Jun 9, 2016

Second review @ChristophWurst @icewind1991 ?

@ChristophWurst
Contributor

👍 looks good

@PVince81 PVince81 merged commit 72b7622 into stable9 Jun 9, 2016

20 of 22 checks passed

core-ci-linux-swift-primary-storage/database=mysql,label=SLAVE Build #57155 failed in 1 hr 3 min
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #10975 failed in 14 min
Details
cla-bot-core Build #4697 succeeded in 26 sec
Details
continuous-integration/php-5.4 Build #4711 succeeded in 21 min
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #62639 succeeded in 11 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #31566 succeeded in 1 hr 1 min
Details
core-ci-linux/database=oci,label=SLAVE Build #31566 succeeded in 1 hr 33 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #31566 succeeded in 1 hr 10 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #31566 succeeded in 35 min
Details
ocs-api-integration-tests-ci Build #11462 succeeded in 20 min
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #10975 succeeded in 4 min 17 sec
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #10975 succeeded in 8 min 58 sec
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #21734 succeeded in 3 min 14 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #39840 succeeded in 16 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 8 min 8 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 44 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 17 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 54 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 40 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 12 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #15312 succeeded in 22 min
Details
@PVince81 PVince81 deleted the stable9-err-reload-delay branch Jun 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment