Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module. 
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
 2014-03-19 19:30:45 +02:00
Alison Hodges
0752b008bb Merge pull request #2976 from edx/ahodges/documentation/hackathon 
Instructor dash changes for DOC-231, resequencing for DOC-230
 2014-03-19 11:03:55 -04:00
Alison Hodges
ba67e59ead Instructor dash changes for DOC-231, resequencing for DOC-230, and fixed display of notes 2014-03-19 11:02:55 -04:00
Usman Khalid
8b6e3b4422 Replaces print statement in django_comment_client with unicode log.debug. 
LMS-2194
 2014-03-19 19:36:55 +05:00
Usman Khalid
ae73f3eaa0 Puts module.render() in try statements. 
LMS-1192
 2014-03-19 19:30:22 +05:00
Anton Stupak
f1a34256ad Merge pull request #2965 from edx/anton/update-acceptance-test 
Video: update acceptance test.
 2014-03-19 16:27:04 +02:00
Waheed Ahmed
78e31cf39d Merge pull request #2984 from edx/waheed/lms2307-fix-lagacy-dash-ugettext-imported-as-u 
Fixed "ugettext" is imported as "_u" in lagacy dash.
 2014-03-19 19:12:55 +05:00
Waheed Ahmed
5fccc46bfb Fixed "ugettext" is imported as "_u" in lagacy dash. 
LMS-2307
 2014-03-19 18:19:15 +05:00
Mark Hoeber
a0289b06cb Merge pull request #2961 from edx/markhoeber/documentation/release-notes-3-18-14 
Release Notes for 3-18-14
 2014-03-19 09:13:27 -04:00
Will Daly
1287268cb7 Update XBlock to latest version 2014-03-19 07:45:45 -04:00
Will Daly
1add868b59 Merge pull request #2971 from antoviaque/mentoring-noworkbench 
mentoring-noworkbench: Remove import of workbench module (moved to SDK)
 2014-03-19 07:44:10 -04:00
polesye
14b1266e06 Fix flaky acceptance test. 2014-03-19 13:06:10 +02:00
Anton Stupak
5a399e21c2 Merge pull request #2982 from edx/anton/fix-acceptance-test 
Video: Fix flaky acceptance test.
 2014-03-19 12:19:06 +02:00
polesye
59ca4774fb Fix flaky acceptance test. 2014-03-19 11:11:17 +02:00
louyihua
a458b90d37 Fix incorrect parse of url in video_module.py 
Sometimes the video url may look like 'http://abc.com/path/video.mp4?xxxx'.
(For example, the Windows Azure's media service will offer such type of url.)
The original code in video_module.py will produce 'mp4?xxxx' instead of 'mp4'
as the extension of a filename for such type of url, and therefore the video
will be non-playable. The fix here uses the built-in urlparse module to retrive
only the path component from a url and therefore the extension 'mp4' will be
correctly fetched.
 2014-03-19 10:30:25 +08:00
Frances Botsford
d685baf478 added loading pattern to studio 2014-03-18 17:11:51 -04:00
Jay Zoldak
4fc71c1d64 Merge pull request #2977 from edx/zoldak/kill-perfstats 
Kill the perfstats module, which is unused
 2014-03-18 16:55:48 -04:00
Sarina Canelake
136f4388bf Merge pull request #2941 from edx/sarina/lms-1287 
Sarina/lms 1287
 2014-03-18 16:54:45 -04:00
David Baumgold
ac4caf0b59 Merge pull request #2969 from edx/db/fix-mkdir-error 
Mongo modulestore: create data dir
 2014-03-18 16:52:35 -04:00
David Baumgold
31b64ad54e Merge pull request #2933 from edx/cale/quieter-i18n-tests 
Make i18n tests quieter
 2014-03-18 16:51:42 -04:00
David Baumgold
d93238d8de create_dir_if_necessary() is unnecessary 
We already have makedirs_p()
 2014-03-18 16:10:03 -04:00
David Baumgold
380d2177f5 pep8/pyflakes 2014-03-18 16:09:59 -04:00
Sarina Canelake
8f24a5fd5e Batch add/remove beta testers on beta dash 
LMS-1287
 2014-03-18 16:08:59 -04:00
Adam Palay
d7c9491f23 Bulk beta tester add/remove on instructor dashboard 
LMS-1287
 2014-03-18 16:08:58 -04:00
Jim Abramson
2d6bfbadec Merge pull request #2950 from edx/jsa/create-user-locale 
in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us
 2014-03-18 16:06:56 -04:00
Jay Zoldak
1de5e565c3 Kill the perfstats module, which is unused 2014-03-18 15:47:36 -04:00
Diana Huang
865496cc2e Merge pull request #2973 from edx/diana/ab-import-export 
Fix split_test import and export.
 2014-03-18 15:41:25 -04:00
jsa
fb57ffb80a in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us. 
Fixes the create_user admin command, which was creating user accounts
with a potentially invalid language preference.

JIRA: FOR-532
 2014-03-18 15:28:07 -04:00
David Baumgold
a2e910b133 tests only work when generate.main() is called with strict=False 2014-03-18 15:21:08 -04:00
David Baumgold
35f41b7ddd allow stderr if verbosity is off 2014-03-18 15:01:08 -04:00
Xavier Antoviaque
cabda59871 mentoring-noworkbench: Remove import of workbench module (moved to SDK) 2014-03-18 14:41:39 -04:00
Calen Pennington
58f05f3687 Merge pull request #2840 from ionis-education-group/double-edxmako-startup 
Add method to clear mako template lookups
 2014-03-18 14:31:13 -04:00
David Baumgold
19b8b1debe reraise exception without changing traceback 2014-03-18 14:18:33 -04:00
Diana Huang
6f7c73cd4f Fix split_test import and export. 
LMS-2405
 2014-03-18 14:15:13 -04:00
Jim Abramson
32fd073760 Merge pull request #2957 from edx/jsa/forum-user-sync 
Ensure account creation succeeds before creating comments service user
 2014-03-18 14:07:44 -04:00
Greg Price
88b0a0a4c1 Merge pull request #2960 from edx/gprice/FOR-499 
Do not allow students to pin/unpin forum threads
 2014-03-18 14:03:56 -04:00
Joe Blaylock
b8b86527b0 Certificates: Additional flags for regenerate_user 
* -G allows explicit setting of grade condition (e.g., a string such as
  'Distinction', 'Pass', 'F', 'B') for the certificate, regardless of
  grader output for the user.
* -T allows explicit request of a particular certificate template to be
  applied to a given user's certificate regeneration, i.e.:
    -T doctor_distinction.pdf
  to generate a certificate of distinction for doctors.
 2014-03-18 10:57:10 -07:00
Mark Hoeber
a9164f168b edits 2014-03-18 13:49:53 -04:00
David Baumgold
a6d5b7f2c7 Added message to run during i18n tests to inform people that test_generate takes a long time 2014-03-18 13:39:24 -04:00
David Baumgold
337a012c1c Make all i18n scripts use argparse, handle --verbose flag 2014-03-18 13:33:55 -04:00
jsa
b20c8f9248 Ensure account creation succeeds before creating comments service user 
Also improves handling in cases where account creation did succeed, but
comments service user creation did not.

Depends on commit 88abdd8a0b20bc9816f487b25abdea1953f5661d in https://github.com/edx/cs_comments_service

JIRA: FOR-522
 2014-03-18 13:24:30 -04:00
Sef Kloninger
397f383313 missing themed embargo page fails safely to unthemed 2014-03-18 09:00:23 -07:00
Adam
0a45f8278a Merge pull request #2704 from edx/adam/refactor-static-tab-tests 
refactor static tab tests
 2014-03-18 11:44:36 -04:00
Adam Palay
d6522cd123 refactor static tab tests 2014-03-18 10:43:57 -04:00
Mark Hoeber
958c52602f edits 2014-03-18 10:20:06 -04:00
Mark Hoeber
04d51bdda5 edits 2014-03-18 09:55:13 -04:00
Mark Hoeber
d13c81f055 edits 2014-03-18 09:44:06 -04:00
David Baumgold
a564d4d9bf Ensure that mongo modulestore can create its data directory if it does not exist on disk 2014-03-18 09:38:08 -04:00
Valera Rozuvan
0f0b2622eb Merge pull request #2942 from edx/valera/start_introduction_of_jslint 
Start introduction of JSLint for JavaScript
 2014-03-18 08:34:39 +02:00
Mark Hoeber
f4eb88bb11 edits 2014-03-17 17:59:38 -04:00