Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,333 Commits 1 Branch 0 Tags
eaec962de92a67f5eb8bbfed61fa527ff87c1a89
Commit Graph

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
2677598a53 Merge pull request #938 from rocha/mock-mongo-on-event-tracking-tests 
Mock mongo event tracking backend during tests
 2013-09-12 11:27:22 -07:00
jkarni
2b5fa7994f Merge pull request #951 from edx/jkarni/add-mock 
Add mock package to RTD requirements
 2013-09-12 10:58:46 -07:00
Carlos Andrés Rocha
dba03b9cbc Merge pull request #953 from rocha/fix-event-logger-backend-json-encoding 
Fix error encoding datetime objects in the event track logger backend
 2013-09-12 10:44:56 -07:00
Carlos Andrés Rocha
6a64b404a1 Mock mongo event tracking backend during tests 2013-09-12 13:36:49 -04:00
Adam
4b07aa0fb7 Merge pull request #914 from edx/fix/adam/instr-dash-strip 
strip processed fields in instructor dash
 2013-09-12 10:01:15 -07:00
Carlos Andrés Rocha
979ec89f0e Fix error encoding datetime objects in the event track logger backend 
The function json.dumps was being called with incorrect arguments,
causing an infinite recursion when serializing an event containing
datetime objects
 2013-09-12 12:21:08 -04:00
Diana Huang
8194eedcd9 Merge pull request #952 from edx/ormsbee/ss_msg_signing 
Re-enable signature checking of Software Secure postbacks
 2013-09-12 09:03:36 -07:00
David Ormsbee
221777e6ea Re-enable signature checking for Software Secure callbacks 2013-09-12 11:59:03 -04:00
David Baumgold
b16799071e Merge pull request #559 from hikari-boulders/patch-2 
Update discussion.md
 2013-09-12 08:36:43 -07:00
Julian Arni
238899faac Make default parser keep comments 2013-09-12 10:59:56 -04:00
Julian Arni
1bd745f336 Add mock package to RTD requirements 2013-09-12 10:56:47 -04:00
Christina Roberts
784115ac79 Merge pull request #901 from edx/christina/dont_import_checklists 
Do not store expanded action URLs.
 2013-09-12 07:54:25 -07:00
jkarni
5af1fd79ab Merge pull request #932 from edx/jkarni/fix/remove-leftover-file 
Fixes extra 'file' that was leftover locally after import
 2013-09-12 07:50:09 -07:00
Greg Price
67053feec1 Add ARIA dialog role to Markdown editor dialogs 2013-09-12 10:47:47 -04:00
Calen Pennington
8308182b63 Add rb-inotify dependency 2013-09-12 10:46:05 -04:00
David Ormsbee
a7cb28fc90 Merge pull request #949 from edx/ormsbee/force_save_on_photo_id_upload 
Force save of photo_id_key on upload
 2013-09-12 07:37:15 -07:00
David Ormsbee
e3895b7856 Force a save of the model when we're uploading a photo ID so our generated key is always saved. 2013-09-12 10:33:24 -04:00
Julian Arni
ca2049abd3 Fixes extra 'file' that was leftover locally after import 2013-09-12 10:29:41 -04:00
Adam Palay
8bbc11cb2b rename stripping function, make it more explicit 2013-09-12 10:10:19 -04:00
Adam Palay
bc424173ad move _clean_fields to tools.py 2013-09-12 10:10:18 -04:00
Adam Palay
640d00c5be strip processed fields in instructor dash 2013-09-12 10:10:18 -04:00
Adam
2c0a08f78f Merge pull request #864 from edx/adam/welcome-email 
Adam/welcome email
 2013-09-12 07:06:56 -07:00
cahrens
cda45cd77a Add a checklist example to test course for import/export roundtrip. 2013-09-12 09:58:07 -04:00
Diana Huang
dbf088ae39 Merge pull request #944 from edx/diana/fix-camera-detection 
Wait for flash to load before trying to detect a camera
 2013-09-12 06:57:36 -07:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd 
Remove dogstatsd-python in favor of dogapi
 2013-09-12 06:53:02 -07:00
cahrens
ea26b19d0b pylint/pep8 cleanup. 2013-09-12 09:47:30 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
Adam Palay
f446c88f4d fix tests 2013-09-12 09:32:34 -04:00
Adam Palay
bc70b1d9da change formatting for email messages to use full_name instead of first_ and last_name 
fix templates
 2013-09-12 09:32:34 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
Diana Huang
8839a2053e Wait until the flash object is loaded before looking for a camera. 2013-09-12 09:09:35 -04:00
Christina Roberts
0bea1855f7 Merge pull request #928 from edx/christina/courseid_length 
Change course id limit to 65.
 2013-09-12 06:04:11 -07:00
Valera Rozuvan
2286259b65 Merge pull request #943 from edx/valera/update_lti_tests 
Updating LTI Jasmine tests.
 2013-09-12 01:35:19 -07:00
Valera Rozuvan
b858810aa4 Updating LTI Jasmine tests. 
Due to the fact that by default the LTI settings have "http://www.example.com"
set as the default form action (launch_url), tests were updated to reflect the
fact that when setting is in default state, form is not submited, even when
the form action is not empty.
 2013-09-12 11:07:07 +03:00
David Ormsbee
b8fcc118dd Merge pull request #942 from edx/ormsbee/aws_verify_settings 
Tiny change to pull in student verification settings on aws envs
 2013-09-11 22:08:44 -07:00
David Ormsbee
5942a87071 Pull VERIFY_SETTINGS from AUTH_TOKENS 2013-09-12 01:04:01 -04:00
David Ormsbee
92cab96c11 Merge pull request #941 from edx/ormsbee/softwaresecure 
Software Secure message signing and callback
 2013-09-11 21:17:14 -07:00
David Ormsbee
8278357c74 Hook up interface to Software Secure for identity validation. 2013-09-11 23:59:37 -04:00
David Ormsbee
00f96ec79f Merge pull request #937 from edx/zoldak/add-cert-tests 
Add more certificates test for newly implemented features
 2013-09-11 20:33:53 -07:00
David Ormsbee
af9193afda Merge pull request #939 from edx/hotfix/progress-500s 
Hotfix/progress 500s
 2013-09-11 19:04:44 -07:00
David Ormsbee
f9067cbe4d Merge pull request #940 from edx/ormsbee/flash_detect_camera 
Detect cameras and flash
 2013-09-11 18:58:57 -07:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi 
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
 2013-09-11 19:28:58 -04:00
Renzo Lucioni
fbe5cafdab Merge pull request #936 from edx/renzo/instrument-verified-cert-flow 
Renzo/instrument verified cert flow
 2013-09-11 16:02:43 -07:00
Diana Huang
7ab5ae925d Add in the ability to detect webcams and flash. Show error messages. 2013-09-11 18:39:18 -04:00
Frances Botsford
5921bca082 adding notification to photo page when no flash or webcam is detected 2013-09-11 18:39:17 -04:00
David Ormsbee
e498ad522a Add hasCamera() method to flash camera detection 2013-09-11 18:39:17 -04:00
Adam Palay
9538ae35d4 change graders text to unicode 2013-09-11 18:34:03 -04:00
Adam Palay
ee62719025 check if module created from description is None before looking for its child descriptors 2013-09-11 18:33:51 -04:00
Adam Palay
7ff4397e81 change disable_start_dates to False in lms.dev to mirror more closely a production environment 2013-09-11 18:33:43 -04:00
Jay Zoldak
57192c8ad7 Merge pull request #935 from edx/zoldak/fix-cert-tests 
Change locators of links to match updated ids
 2013-09-11 14:30:25 -07:00