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

6118 Commits

Author SHA1 Message Date
Jason Bau
6a850e27bb Address @brianhw review comments 
* Fix open redirect vulnerability
* Add Logging To AUDIT_LOG : Note I had to change existing tests
  that mocked AUDIT_LOG with this
* Use external_auth.views.SHIBBOLETH_DOMAIN_PREFIX in student.views
* Add a bunch of documentation
* PEP8 / Pylint
 2013-09-06 15:37:27 -07:00
Jason Bau
4d656061be Removing handling for ExternalAuthMap.MultipleObjectsReturned 2013-09-06 15:36:22 -07:00
Jason Bau
948c07c493 Revamped + Enhanced Shibboleth support 
* If a shib users type in their email on the regular login page,
  redirects them to /shib-login/
* Modify student.views.accounts_login to handle redirects
  generated by @login_required for courses that use shib for
  access control.
  Redirect those logins to /shib-login/?next=
 2013-09-06 15:36:22 -07:00
Vik Paruchuri
499d272adc Merge pull request #825 from edx/fix/vik/staff-information 
Staff information about duplicate ORA submissions
 2013-09-06 14:14:31 -07:00
Adam
3184939138 Merge pull request #885 from edx/release 
Release
 2013-09-06 13:51:03 -07:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
Chris Dodge
c7f2f27708 fix bug and add unit test 2013-09-06 14:47:59 -04:00
Don Mitchell
0099ee0970 Clarify repr by naming 2013-09-06 12:19:51 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
Vik Paruchuri
0fbbaa83d6 Fix some staff-facing messages 2013-09-06 11:17:46 -04:00
chrisndodge
b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication 
Provide CAS authentication integration
 2013-09-06 07:36:28 -07:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Valera Rozuvan
441eb3699b Merge pull request #869 from edx/valera/video_js_console_log_useful_debug_info 
Adding debugging messages for Video player.
 2013-09-06 04:51:23 -07:00
Valera Rozuvan
73a9c43ebb Addressing Anton's comments on PR 869. 
Removed extra check for console.log() existance. Modified error
messages. Formatted entire file to fit in 80 lines or less.

Formatting files so that they fit under 80 lines. Adding debug info for
what type of YouTube video player is being used. Also comment on whether
playbackRates is available for HTML5 mode.

Changed back Anton's original function _checkPlaybackRates(). Now logging for
this function's result is done only on error (in the function that is invoking)
it).
 2013-09-06 14:16:47 +03:00
Valera Rozuvan
20c16ec69e Adding debugging messages for Video player. 
For now outputting main flow of loading YouTube or non-YouTube videos.
 2013-09-06 14:16:46 +03:00
Valera Rozuvan
b2c605a187 Addressing comments by Jean Michel for PR 867. 
Forgot to include local variables in var statement.
 2013-09-06 14:02:28 +03:00
Valera Rozuvan
8ffd16366f Fix for test. 
Must clear the state youtubeXhr variable before counting number
of ajax calls.
 2013-09-06 11:58:49 +03:00
Valera Rozuvan
545af7e854 Jasmine test to verify that only one check for YT is made. 
We test for the number of ajax calls made when there are 3
videos on the page.
 2013-09-06 11:58:49 +03:00
jmclaus
e1f75666fa Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case. 2013-09-06 09:22:33 +02:00
jmclaus
8e2c5bca7b Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button. 2013-09-06 09:22:33 +02:00
jmclaus
578e02b589 Speed button know behaves like the volume button when tabbing forward or backward. 2013-09-06 09:22:33 +02:00
chrisndodge
9aa024b585 Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline 
Fix capa optioninput template to honor inline flag
 2013-09-05 15:51:30 -07:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Anton Stupak
5d55714cad Fix test. 2013-09-05 10:27:41 -04:00
Anton Stupak
961bd4c9cb Fix selector. 2013-09-05 10:27:29 -04:00
Anton Stupak
d93215c0b9 Fix test. 2013-09-05 17:02:53 +03:00
Anton Stupak
af6d0eb145 Fix selector. 2013-09-05 10:49:42 +03:00
ichuang
69f72989c5 consistently use inline=False as default in capa inputtypes 2013-09-04 23:13:05 -04:00
Chris Dodge
0847bc5e2b pep8/pylint violations fixes 2013-09-04 11:34:35 -04:00
ichuang
00710f75d2 add CAS authentication via django_cas and mods to external_auth 2013-09-04 10:56:45 -04:00
Adam
ef042c39aa Merge pull request #853 from edx/fix/adam/pylint-pep8 
fix pep8 and pylint errors
 2013-09-03 14:22:11 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Adam Palay
300f7f13a6 fix pep8 and pylint errors 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
 2013-09-03 14:55:11 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Will Daly
e94515df80 Fix for acceptance test static file issue 2013-09-03 11:36:23 -04:00
Will Daly
24d3d9492a Merge pull request #836 from edx/will/fix-video-caption-tests 
Updated acceptance tests to match new behavior in video captions.
 2013-09-02 10:31:45 -07:00
ichuang
d7fdcd904a fix capa optioninput template to honor inline flag 2013-08-31 15:14:05 -04:00
Sarina Canelake
6defd7baf1 Merge pull request #790 from edx/unanswered-on-input 
Unanswered on input
 2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Adam Palay
5b0194d9b4 bump version number on calc 2013-08-30 16:59:46 -04:00
Adam Palay
589dcfcc35 change calcfunctions -> functions 2013-08-30 16:57:44 -04:00
Adam Palay
2284f56e20 specify preview import statements to reflect new package structure 2013-08-30 16:57:27 -04:00
Adam Palay
ac90679544 restructure calc 2013-08-30 16:57:10 -04:00
Will Daly
2ed66ce7a5 Updated acceptance tests to match new behavior in video captions. 2013-08-30 16:17:01 -04:00
Calen Pennington
ea36b834c7 Merge pull request #811 from cpennington/initialize-mitxmako-at-startup 
Move mitxmako initialization to a startup module
 2013-08-30 13:10:09 -07:00
Peter Baratta
48cb05c037 Reset 'correctness' visual indicator of a problem on new input 
Affects:
Choicegroups, option inputs, textline, and formula equation inputs
 2013-08-30 12:03:41 -04:00
Christina Roberts
d893e6d440 Merge pull request #827 from edx/christina/course-info-links3 
Rewriting of links for Course Updates and Course Handouts.
 2013-08-30 07:32:01 -07:00
Vik Paruchuri
df03b09136 Merge pull request #824 from edx/fix/vik/oe-progress 
Properly display student progress
 2013-08-29 14:39:11 -07:00
Vik Paruchuri
9b57ef0b54 Pep8 fixes 2013-08-29 17:28:14 -04:00