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

29344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
9edda95096 Merge pull request #7481 from edx/clytwynec/flaky-mathjax 
update bokchoy with fix for TNL-1770
 2015-03-26 08:57:11 -04:00
Christine Lytwynec
3a8716a36f update bokchoy with fix for TNL-1770 2015-03-25 17:02:10 -04:00
David Baumgold
609b114443 Merge pull request #7475 from edx/adjust-indentation 
Fix whitespace
 2015-03-25 15:58:01 -04:00
Christina Roberts
3f07660d27 Merge pull request #7454 from edx/andya/user-api-transaction-handling 
Clean up transactional behavior in User API
 2015-03-25 15:08:21 -04:00
Andy Armstrong
a9dce7c331 Clean up transactional behavior in User API 2015-03-25 13:44:03 -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
aeff0880ac Merge pull request #7453 from edx/will/ecom-1198 
ECOM-1198: Login/Registration page can skip track selection.
 2015-03-25 11:46:04 -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
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
65356f8a36 Merge pull request #7446 from edx/ned/clean-up-eo 
Change how conf/locale/eo is cleaned up, so that it happens when needed
 2015-03-24 13:28:19 -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
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
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
Ahsan Ulhaq
230287d43f Merge pull request #7334 from edx/ahsan/tnl-1699-remove-buttons-from-aria-live-region 
Ahsan/tnl 1699 remove buttons from aria live region
 2015-03-24 16:14:49 +05: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
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
Sarina Canelake
c6ab15c64c Merge pull request #7352 from edx/sarina/pep8-quality-report 
Improve pep8 reporting
 2015-03-23 21:10:58 -04:00
Sarina Canelake
e77211b713 Run pep8 on all files, and fix uncovered errors 2015-03-23 15:50:29 -04: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
Sarina Canelake
bd090a6e58 Fix paver quality tests to reflect removed diff-quality call 2015-03-23 15:37:56 -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
99430113e3 Fix pre-existing pylint violations 2015-03-23 12:40:25 -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
Sarina Canelake
a51fbc8123 Refactor pep8 to run instead of diff-quality pep8 2015-03-23 11:01:32 -04:00
Sarina Canelake
1b65afdd04 Give run_pep8 more readable output 
Jenkins "Quality Report" pep8 output now lists all pep8 violations,
not just the number of violations.
 2015-03-23 11:01:32 -04:00
Sarina Canelake
8710c63839 Merge pull request #7447 from edx/sarina/20150323-update-translations 
Update translations (autogenerated message)
 2015-03-23 10:51:08 -04:00
Sarina Canelake
71486fc45b Update translations (autogenerated message) 2015-03-23 10:49:44 -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
Chris Rodriguez
f8da29b9cf Styling for automatic cert generation on Progress page 2015-03-23 10:44:33 -04:00
Martyn James
e8cf0a35df Merge pull request #7423 from edx/mjames/update_search_hash 
Updating edx-search hash to include bugfixes
 2015-03-23 10:39:31 -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
7426102de1 Merge pull request #7017 from edx/ammar/move-cohort-management-tnl-1268 
Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab.
 2015-03-23 19:05:53 +05: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