Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,419 Commits 1 Branch 0 Tags
05da125aed190f951e6fa704ce24f30adefa76be
Commit Graph

5419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimth
05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints 
Added styles for problems
 2012-08-31 10:30:50 -07:00
Kyle Fiedler
440539c081 Removed js from textbox 2012-08-31 13:27:32 -04:00
Kyle Fiedler
e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure 2012-08-31 11:15:06 -04:00
Carlos Andrés Rocha
20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider 
OpenID provider implementation
 2012-08-31 06:23:03 -07:00
David Ormsbee
785ddb5df1 Merge pull request #584 from MITx/feature/victor/double-double-html 
Fix inline html bug.
 2012-08-31 05:34:22 -07:00
David Ormsbee
717223be92 Merge pull request #577 from MITx/feature/victor/fix-url_name-cleanup 
Feature/victor/fix url name cleanup
 2012-08-31 05:32:18 -07:00
Carlos Andrés Rocha
327b3a4648 [34078525] Log openid root_trust validation failures as errors 2012-08-31 06:43:28 -04:00
Carlos Andrés Rocha
0a81684ac3 [34078525] Fix error saving open_id request in session 2012-08-31 06:43:08 -04:00
Carlos Andrés Rocha
d702082daa [34078525] Add test settings for openid 2012-08-31 06:31:18 -04:00
Carlos Andrés Rocha
27fe80d57c [34078525] Use system random to generate passwords 2012-08-31 06:29:07 -04:00
Kyle Fiedler
1939b001e4 Added better animation in 2012-08-30 16:26:01 -04:00
Kyle Fiedler
bc288424a4 Rework styles for test results and style file upload 2012-08-30 15:22:27 -04:00
Kyle Fiedler
3be48e5012 Formatted new hints and testing blocks 2012-08-30 13:18:01 -04:00
Kyle Fiedler
a9f624115c Added styles for hints 2012-08-30 13:18:01 -04:00
David Ormsbee
a27ba692a8 Merge pull request #593 from MITx/feature/ichuang/fix-typo-in-lms-migration 
missing "settings." in line in lms_migration
 2012-08-30 10:11:09 -07:00
David Ormsbee
8c5b203dfb Merge pull request #591 from MITx/kimth/gentler-frontend 
A gentler, more helpful frontend
 2012-08-30 10:10:44 -07:00
Carlos Andrés Rocha
87967b9eb8 [34078525] Makes OpenID provider login box modal. 2012-08-30 11:15:08 -04:00
Victor Shnayder
4ce41c0111 fix course_ids for Berkeley internal courses and 3.091 2012-08-30 10:53:38 -04:00
kimth
86409a2a26 Adjust comments for Sequence js 2012-08-29 22:11:26 -04:00
ichuang
cb07b0601e missing "settings." in line in lms_migration 2012-08-29 22:04:39 -04:00
kimth
bb55a76379 Allow courseware to navigate to specific tabs of a sequence 2012-08-29 22:01:16 -04:00
kimth
e62f8d7562 More info in StudentInputError 2012-08-29 20:03:26 -04:00
David Ormsbee
5ae92a19d3 Merge pull request #592 from MITx/feature/arjun/fix_discussions_in_sequences 
Fix discussions in xmodules
 2012-08-29 16:49:04 -07:00
Arjun Singh
5d6bed863a Fix discussions in xmodules 2012-08-29 16:41:01 -07:00
Carlos Andrés Rocha
902a887e79 [34078525] pep8 renaming of some extern_auth functions 2012-08-29 18:46:35 -04:00
Carlos Andrés Rocha
cd4aab13fb [34078525] Added OPENID_PROVIDER_TRUSTED_ROOTS django setting 
Added OPENID_PROVIDER_TRUSTED_ROOTS django setting. It should be a
list of glob matching patterns: ['*.cs50.net', '*.other.net']

Also did some minor refactoring and cleanup.
 2012-08-29 18:40:12 -04:00
kimth
1fd2f0c601 Fix double show answer bug 2012-08-29 18:02:37 -04:00
David Ormsbee
a29991e831 Merge pull request #590 from MITx/feature/arjun/allow_uncaptioned_videos 
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
 2012-08-29 14:01:37 -07:00
Arjun Singh
5c5d11409a Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution. 2012-08-29 13:58:22 -07:00
Nate Hardison
c97db851fb Getting rid of unneeded variables 2012-08-29 15:28:44 -04:00
Carlos Andrés Rocha
cb67af5959 [34078525] OpenID provider cleanup and minor fixes 2012-08-29 12:43:08 -04:00
Nate Hardison
4126f3a29a Validating OpenID request trust roots to only come from *.cs50.net 2012-08-29 11:57:41 -04:00
Tommy MacWilliam
6de28fc592 feature flag, consumer displayed, logging 
- provider placed behind separate feature flag
- domain of openid consumer displayed in login page
- added logging for successful login, changed log messages to include
  "OpenID"
 2012-08-29 10:37:02 -04:00
Tommy MacWilliam
4b6694a4ce OpenID provider implementation 
- endpoint supports both SReg and AX
- identity taken from edX username
- sreg fullname and ax http://axschema.org/namePerson taken from edX
  name
- sreg email and ax http://axschema.org/contact/email taken from edX
  email
 2012-08-29 10:29:42 -04:00
jarv
30543d457b Merge pull request #574 from MITx/feature/arjun/pygraphviz 
adding pygraphviz
 2012-08-29 07:07:22 -07:00
David Ormsbee
50c682e459 Merge pull request #583 from MITx/rocha/master 
[#35065403] Lets video player work if subtitles cannot be loaded
 2012-08-29 07:01:58 -07:00
David Ormsbee
b62d953524 Merge pull request #585 from MITx/feature/arjun/sane_save 
Getting rid of an alert. People don't like alerts.
 2012-08-29 07:01:07 -07:00
Arjun Singh
1c176d369b add margin between checkbox and text 2012-08-29 03:25:08 -07:00
Arjun Singh
ac65e47e21 Getting rid of an alert. People don't like alerts. 2012-08-29 03:15:30 -07:00
Victor Shnayder
fe50f94437 Fix inline html bug. 
* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
  obviously correct.

[Fix #35136297]
 2012-08-28 19:54:57 -04:00
Victor Shnayder
cbfc117e8b a few edits to the xml format docs 2012-08-28 19:53:46 -04:00
Carlos Andrés Rocha
aa063d5729 [#35065403] Lets video player continue to work if subtitles cannot be loaded 2012-08-28 18:18:37 -04:00
David Ormsbee
1a97a1ced0 Merge pull request #582 from MITx/feature/arjun/jsresponse_compilation 
Disable jsresponse file compilation; done manually for now.
 2012-08-28 12:56:37 -07:00
Arjun Singh
6a6b24af79 Disable jsresponse file compilation; done manually for now. 2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d Merge pull request #571 from MITx/feature/arjun/contextualize_js_params 
Contextualizing javascript parameters
 2012-08-28 11:07:49 -07:00
David Ormsbee
6255fe5a79 Merge pull request #563 from MITx/kimth/check-grader-html 
Check grader message has proper XML structure
 2012-08-28 10:47:28 -07:00
David Ormsbee
1b3c84ace7 Merge pull request #579 from MITx/sarina/fix_video_title 
Fix display titles on video pages
 2012-08-28 10:39:36 -07:00
kimth
bad24df842 Adjust tests to reflect XML requirement for external grader messages 2012-08-28 13:31:06 -04:00
kimth
09b2f4e55c Merge branch 'master' into kimth/check-grader-html 2012-08-28 13:16:14 -04:00
David Ormsbee
521521c66b Merge pull request #559 from MITx/kimth/send-idhash 
Kimth/send idhash
 2012-08-28 10:15:24 -07:00