Skip to content

Detect cameras and flash - #940

Merged
ormsbee merged 3 commits into
rc/2013-09-12from
ormsbee/flash_detect_camera
Sep 12, 2013
Merged

Detect cameras and flash#940
ormsbee merged 3 commits into
rc/2013-09-12from
ormsbee/flash_detect_camera

Conversation

@dianakhuang

Copy link
Copy Markdown
Contributor

Put up error messages if they can't be found.

@ormsbee ?

ormsbee pushed a commit that referenced this pull request Sep 12, 2013
@ormsbee
ormsbee merged commit f9067cb into rc/2013-09-12 Sep 12, 2013
@dianakhuang
dianakhuang deleted the ormsbee/flash_detect_camera branch September 12, 2013 12:33
jenkins-ks pushed a commit to nttks/edx-platform that referenced this pull request Aug 9, 2016
* Merge pull request openedx#937 from nttks/gacco/cypress.biz-2nd (openedx#943)

* Merge pull request openedx#937 from nttks/gacco/cypress.biz-2nd

gacco/cypress.biz 2nd
(cherry picked from commit 4bc3bc2)

Conflicts:
	biz/djangoapps/ga_achievement/management/commands/tests/test_update_biz_score_status.py
	lms/djangoapps/ccx/tests/test_field_override_performance.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/envs/test.py
	setup.py

* Merge pull request openedx#941 from kawaguchi-ks/develop/cypress/biz-fix-timezone-problem

Fix timezone problem on boundary test.
(cherry picked from commit 20e1b0c)

* Fix transaction, autocommit(commit_on_success) -> atomic.

* Define class Meta.

* Change AUTHENTICATION_BACKENDS for disable RateLimitBackend within lo… (openedx#902)

* Change AUTHENTICATION_BACKENDS for disable RateLimitBackend within login authentication(openedx#540) (openedx#883)
(cherry picked from commit 1e8b68a)

Conflicts:
	cms/djangoapps/course_creators/tests/test_admin.py

* Fix test, "RedirectCycleError: Redirect loop detected".
bradenmacdonald pushed a commit to open-craft/openedx-platform that referenced this pull request Oct 17, 2017
YONK-785: Moved course engagement score update into signal handlers
ericfab179 pushed a commit to eduNEXT/edx-platform that referenced this pull request Sep 14, 2018
kluo pushed a commit to kluo/edx-platform that referenced this pull request Oct 19, 2019
…tour-xblock-everywhere

Bump platform-tour-xblock to 1.0.4 everywhere
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants