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

10586 Commits

Author SHA1 Message Date
chrisndodge
f441671ca0 Merge pull request #7428 from stvstnfrd/env/course/display 
Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS
 2015-03-27 16:41:42 -04:00
Christine Lytwynec
4d6c47c456 Merge pull request #7503 from edx/clytwynec/lms-onload-beacon 
onload performance beacon for LMS pages
 2015-03-27 16:28:30 -04:00
Christine Lytwynec
06b3110ea0 onload performance beacon for LMS pages 2015-03-27 11:08:25 -04:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists. 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2015-03-26 16:18:15 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
89252ec12d Put Open edX logo in LMS edx.org footer 2015-03-26 10:14:37 -04:00
David Baumgold
609b114443 Merge pull request #7475 from edx/adjust-indentation 
Fix whitespace
 2015-03-25 15:58:01 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
David Baumgold
6840ced41f Fix whitespace 
Don't mix tabs and spaces!
 2015-03-25 13:24:58 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection. 
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
 2015-03-25 09:15:31 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context 
adds additional context for SR users and corrects heading order
 2015-03-24 13:51:33 -04:00
Chris
990f6a0b76 Merge pull request #7462 from edx/clrux/logistration-text-alignment-fix 
Centering the third-party social media buttons
 2015-03-24 10:55:46 -04:00
Chris Rodriguez
0bdb43a45f Centering social media buttons 2015-03-24 10:08:21 -04:00
Ahsan Ulhaq
2e0d35f180 Remove submission buttons from aria-live region 
added a new aria-live region and added problem html into that.
Removed submission buttons out of the aria-live div scope.

TNL-1699
 2015-03-24 13:41:07 +05:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only 
Add web-only setting to video module
 2015-03-23 15:38:18 -04:00
chrisndodge
4900d7a5ab Merge pull request #7452 from edx/cdodge/get-courses-filter 
do the ORG filtering as part of the mongo query. Also, don't trigger met...
 2015-03-23 15:07:09 -04:00
Will Daly
a1e446d4ef Merge pull request #7445 from edx/will/ecom-803 
Update aria label on edX footer
 2015-03-23 15:05:08 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module 
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
 2015-03-23 14:45:17 -04:00
Ned Batchelder
c08ccee45a Merge pull request #7450 from edx/ned/common-lib-to-openedx-core-lib 
Move common/lib/*.py to openedx/core/lib so that we can import them.
 2015-03-23 14:00:35 -04:00
Stephen Sanchez
798f91ca5a Merge pull request #7434 from edx/sanchez/track_internal_request_errors 
XCOM-147: Change error handling to report back internal errors.
 2015-03-23 13:26:06 -04:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00
Chris Dodge
b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) 2015-03-23 12:28:20 -04:00
Stephen Sanchez
c01602f094 Change implementation of improved logging based on new API. 2015-03-23 16:21:05 +00:00
Will Daly
c6eef03258 Update aria label on edX footer 2015-03-23 12:15:24 -04:00
Will Daly
e66409be45 Merge pull request #7444 from edx/will/self-gen-certs-docstring-cleanup 
Docstring/messaging cleanup in self-generated certs view.
 2015-03-23 12:13:53 -04:00
Will Daly
072dbcd50f Merge pull request #7412 from edx/will/ecom-1233 
A11y fixes for EdX header.
 2015-03-23 11:34:54 -04:00
Will Daly
30058b913c Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates 
Styling for automatic cert generation on Progress page
 2015-03-23 11:23:43 -04:00
Stephen Sanchez
7af1ee3e5f Change error handling to report back internal errors. 2015-03-23 15:21:45 +00:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181 
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
 2015-03-23 19:49:03 +05:00
Chris Rodriguez
f8da29b9cf Styling for automatic cert generation on Progress page 2015-03-23 10:44:33 -04:00
Martyn James
775de9e818 Merge pull request #7150 from edx/dcikatic/courseware_search_tracking 
SOL-217 Adding basic analytics events logging for courseware search - In discussing with @mulby, we agreed to allow this to go in , and we'll add a story to improve the tests at a later time.
 2015-03-23 10:37:23 -04:00
Usman Khalid
c50f828187 Fixes after rebase. 2015-03-23 19:03:31 +05:00
Will Daly
659535365d Update error messaging for progress page self-gen certs 
Clean up docstrings for gen cert POST.
 2015-03-23 09:10:39 -04:00
Will Daly
cb21a0819c A11y fixes for EdX header. 
Update <nav> elements to correctly group links
for screen readers.

Fix RTL display issue with responsive header
on the login/registration page.
 2015-03-23 08:47:35 -04:00
Will Daly
3f2cd706e8 Merge pull request #7437 from edx/will/ecom-1229 
Course info page no longer creates enrollments.
 2015-03-23 08:32:15 -04:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard. 
TNL-1256
 2015-03-23 14:28:22 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page. 
TNL-1258
 2015-03-23 09:58:25 +05:00
Usman Khalid
d382f569c8 Refactor django_comment_client.utils.prepare_content() to query 
course cohort settings only once.

TNL-1258
 2015-03-23 09:57:07 +05:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings. 
TNL-1258
 2015-03-23 09:43:00 +05:00
muhammad-ammar
b56e123350 Change labels 2015-03-23 09:21:23 +05:00
muhammad-ammar
9ce66c78fd Rename Cohort Management to Cohorts 
Move `Cohorts` section after `Membership` section
 2015-03-23 09:21:22 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab 
TNL-1268
 2015-03-23 09:21:15 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method 
TNL-181
 2015-03-23 09:10:59 +05:00
Nimisha Asthagiri
289469dd3a Merge pull request #7353 from edx/mobile/third-party-oauth-reg 
Mobile registration with Google/FB
 2015-03-20 17:04:37 -04:00
Ned Batchelder
8a1877f0ad Merge pull request #7436 from edx/ned/upgrade-pylint 
Upgrade pylint
 2015-03-20 16:34:52 -04:00