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

10750 Commits

Author SHA1 Message Date
Ahsan Ulhaq
0b3790a024 DOM updates on every keystroke are triggering aria-live region announcements 
TNL-1784
 2015-03-30 16:03:06 +05:00
Waqas Khalid
01bdfb125e Merge pull request #7403 from edx/waqas/tnl1717-discussion-404 
View discussion of user profile return 404
 2015-03-30 14:36:25 +05:00
Martyn James
70819203f8 Merge pull request #7443 from edx/mjevtic/SOL-336 
Fixed flaky test(s) - SOL-336 - merging updates
 2015-03-27 14:58:25 -04:00
Sarina Canelake
68ba17867f Merge pull request #7496 from open-craft/studio-display-name-consistency 
Consistently use display_name_with_default in Studio
 2015-03-27 14:57:22 -04:00
Ned Batchelder
33361a05e4 Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree 
Don't use the working tree as storage for test-created files.
 2015-03-27 11:30:04 -04:00
marjev
29bceffcea Fixed flaky test(s) - (SOL-336) 2015-03-27 14:48:36 +01:00
Braden MacDonald
19bd7005e6 Consistently use display_name_with_default in Studio 2015-03-26 13:24:11 -07: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
Ben Patterson
5615f0bfed Merge pull request #7494 from edx/benp/flag-cohort-test-flaky 
Fix empty promise. It was always evaluating to true.
 2015-03-26 13:55:04 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release 
Release
 2015-03-26 12:56:41 -04:00
Ben Patterson
dae5cdfceb Fix empty promise. It was always evaluating to true. 
This addresses TNL-1808 (and likely other flaky tests
in this area).
 2015-03-26 12:27:30 -04:00
Ben Patterson
b03c4eca63 Opening wiki editor should be extracted into a method. 2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14 Add course wiki acceptance tests. 2015-03-26 11:05:55 -04:00
Ned Batchelder
84f6e11830 Don't use the working tree as storage for test-created files. 2015-03-26 09:38:09 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -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
Christine Lytwynec
7f137487cc Merge pull request #7463 from edx/clytwynec/flaky-mathjax 
wait for both window.MathJax and window.MathJax.onReady
 2015-03-24 13:50:57 -04:00
Ned Batchelder
6401f453ca Change how conf/locale/eo is cleaned up, so that it always happens 2015-03-24 11:18:45 -04:00
Christine Lytwynec
5204fd6519 wait for both window.MathJax and window.MathJax.onReady 2015-03-24 11:03:09 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone 
Unified Course Team and Library Users page. Converted both to Backbone.
 2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone. 
Converted lettuce Course Team page tests to bok choy
 2015-03-24 12:09:19 +03: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
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
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
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
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
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
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
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
d59be9949e Use cohort settings from CourseCohortSettings. 
TNL-1258
 2015-03-23 09:43:00 +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
muzaffaryousaf
d839692437 Added get_cohort_associated_assignment_type method. 2015-03-23 09:10:59 +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
dd8aba8fc9 Fixes merge conflict with account creation transaction. 2015-03-21 09:23:27 -04:00
Braden MacDonald
c35cd5d841 Merge pull request #7420 from open-craft/fix-library-analytics 
Fix two content library analytics issues (SOL-521)
 2015-03-20 21:40:35 -07:00
Braden MacDonald
7764f364cd Fix two content library analytics issues (SOL-521) 2015-03-20 20:47:03 -07: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
f396c11579 Fix unidiomatic type checking 2015-03-20 15:48:54 -04:00
Nimisha Asthagiri
dfcef9ddcb MA-95: Update Registration endpoint to support 3rd party credentials 
Automatically link edX account with social account in login mobile API path
 2015-03-20 15:43:40 -04:00
Jesse Zoldak
5d65f577eb Merge pull request #7431 from edx/zoldak/SOL-336 
Decorate flaky test SOL-336
 2015-03-20 13:20:22 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2015-03-20 10:42:22 -04:00
Jesse Zoldak
bb4e57762f Decorate flaky test SOL-336 2015-03-20 10:13:11 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Sarina Canelake
90a0459e50 Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm 
Keep platform_name in the password_reset_confirm.html always TNL-1654
 2015-03-20 09:14:40 -04:00
Martyn James
5d54036090 Fix pylint violation 2015-03-20 10:41:56 +01:00
Dino Cikatic
ee90c5fe36 SOL-217 Remove Google Analytics calls 2015-03-19 21:52:24 +00:00