Commit Graph

29321 Commits

Author SHA1 Message Date
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
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
Sarina Canelake
bd090a6e58 Fix paver quality tests to reflect removed diff-quality call 2015-03-23 15:37:56 -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
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
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
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
eee6250fb2 Use RequestCache to cache cohorts information.
TNL-1258
2015-03-23 09:57:16 +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
a9e0082c7c Cache cohort info during requests to reduce SQL queries.
TNL-1258
2015-03-23 09:44:23 +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
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
ec6cc04b90 Merge pull request #7440 from edx/nimisha/fix-account-creation-merge-issue
Fixes merge conflict with account creation transaction.
2015-03-21 14:06:56 -04: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