Commit Graph

10736 Commits

Author SHA1 Message Date
Chris
4a27e8b6cc Merge pull request #7711 from edx/clrux/UX-1946-div-focus-fix
Adding outline styles (none) to the sr focus div
2015-04-17 12:44:27 -04:00
Marco Morales
25b0264a48 Merge pull request #7730 from edx/marco/fix/course-refund-via-unenroll
Still show dropdown actions even if course isn't accessible.
2015-04-17 11:21:48 -04:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
Chris Rodriguez
cb1bfa53de Adding outline styles (none) to the sr focus div 2015-04-17 08:55:29 -04:00
Braden MacDonald
00db27b63e Merge pull request #7638 from open-craft/problem-builder-version-bump
Bump version of Problem Builder
2015-04-16 16:38:57 -07:00
Marco Morales
a43f411297 Merge pull request #7608 from indagation/close-modal
Fix modal close button
2015-04-16 17:27:50 -04:00
Marco Morales
c67e8b9ef4 moved the dropdown actions outside of the if show_courseware_link in attempt to still show the dropdown actions 2015-04-16 16:40:46 -04:00
Chris
c5ce007a93 Merge pull request #7712 from edx/clrux/UX-2001-summary-table-contrast
Chaning table th td color to meet AA guidelines
2015-04-16 15:40:37 -04:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Sarina Canelake
cb333c414a Merge pull request #7670 from louyihua/lms_i18n_1
Better i18n (cont.)
2015-04-16 14:05:53 -04:00
Adam
9a35c51e6e Merge pull request #7724 from edx/release
Release
2015-04-16 13:40:41 -04:00
louyihua
b7c6b4ad55 Better i18n (cont.)
1. Fix sentence breaks inside `photo_reverification.html` and `midcourse_photo_reverification.html`.
2. Combine three setences inside `choose.html`.
3. Adding some punctuation marks to reduce duplicated strings with only different Punctuation marks in translation.
4. Move the colons inside the strings to be translated. This may be not necessary for now, but I think this may help translation by removing potential word meaning conflict.
5. Sorry for
2015-04-17 01:05:46 +08:00
Adam Palay
987ea8551e fix quality violation 2015-04-16 10:13:36 -04:00
Marco Morales
9e525d6b5c added images to the bulk email directory to include Youtube as a social icon option 2015-04-16 10:03:22 -04:00
Chris Rodriguez
b6b7acbd53 Chaning table th td color to meet AA guidelines 2015-04-16 06:57:42 -04:00
Chris
c641155cb2 Merge pull request #7467 from edx/clrux/UX-1810-a11y-color-fix--blue
Accessibility: Updating the color blue on LMS
2015-04-16 06:55:32 -04:00
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title
iframe elements require a meaningful title attribute
2015-04-16 13:54:15 +05:00
Awais Jibran
efc1d5d3ef Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-discussion
Fixed Long discussion post not rendering Latex expressions
2015-04-16 10:49:58 +05:00
Marco Morales
031edf6abf Merge pull request #7221 from edx/marco/discussions-related-to
Updated Styling for course references in discussion forum posts
2015-04-15 19:47:54 -04:00
Adam Palay
9196817abb Revert "Decrease the number of inserts and updates needed by DjangoKeyValueStore"
This reverts commit 88b9187476.
2015-04-15 17:41:11 -04:00
Carson Gee
b6970d9aa3 Put CCX URLs behind their feature flag
- Moved the CCX URLS into their django app.
2015-04-15 16:38:10 -04:00
Chris Rodriguez
e789c554c7 Updating blue color variables for accessibility in the LMS 2015-04-15 15:23:23 -04:00
Awais Jibran
65c5ec8073 Fixed Long discussion post not rendering Latex expressions
TNL-1902
2015-04-15 20:43:39 +05:00
Greg Price
ce8a6e5b1d Merge pull request #7666 from edx/gprice/fix-oauth-exchange
Enable OAuth token exchange only if OAuth provider
2015-04-14 17:54:27 -04:00
Marko Jevtić
a3aecb2014 Merge pull request #7548 from edx/mjevtic/SOL-531
(SOL-531)(SOL-532) Course Cards update on the homepage;
2015-04-14 16:17:34 +02:00
Marco Morales
1aa6275b7b updated styling for LMS post references 2015-04-14 10:06:01 -04:00
zubair-arbi
b6fd30313a Merge pull request #7679 from edx/zub/bugfix/ecom-1355-ie9-verification-webcam-without-flash
show error message to user on photo reverification page if Flash not fou...
2015-04-14 18:41:39 +05:00
marjev
939a3672d4 (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage 2015-04-14 14:58:06 +02:00
zubair-arbi
e04e61d686 show error message to user on photo reverification page if Flash not found
ECOM-1355
2015-04-14 15:39:51 +05:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard
- sharing enabled for custom URLs only if URL actually specified
2015-04-13 13:14:43 -04:00
Greg Price
903422b861 Enable OAuth token exchange only if OAuth provider 2015-04-13 12:46:28 -04:00
Ali Mohammad
6b11ff6f22 Merge pull request #7650 from edx/multibeacon
Added more precise alerting to video beacon experiment.
2015-04-13 12:11:21 -04:00
Sarina Canelake
13fe58e195 Merge pull request #7637 from louyihua/misc_i18n_1
Better i18n for LMS
2015-04-13 11:14:36 -04:00
chrisndodge
f38b90fd3c Merge pull request #7659 from edx/cdodge/fix-translation-help
fix I18N errors in business order confirmation email
2015-04-13 10:46:50 -04:00
Chris Dodge
768dd92256 fix I18N errors in business order confirmation email 2015-04-13 09:39:07 -04:00
Awais Qureshi
b8368617e6 Merge pull request #7627 from edx/awais786/ECOM-1183-verification-expiry
ECOM-1183 fixing the
2015-04-13 18:10:40 +05:00
louyihua
9a0da7d670 Better i18n
Combine sentences in several pages for better translation.
2015-04-13 13:10:23 +08:00
Sarina Canelake
293f256817 Fix typo: Certfificate -> Certificate 2015-04-11 18:24:37 -04:00
David Ormsbee
03c3bbb379 Merge pull request #6636 from jazkarta/feature-pocs
MIT CCx (was Personal Online Courses)
2015-04-11 11:15:43 -04:00
Carlos de la Guardia
f9351ef830 MIT: CCX. Code Quality Fixes
Remove duplicated course listings template code on the student dashboard.
2015-04-10 23:30:27 -04:00
cewing
8ba74429b1 MIT: CCX. Fixes for API changes that affect the binding of descriptors to student context.
fix for making sure all descriptor fields are always available for course descriptors despite module_class tricks

add required fields to cache data for tests

use a different strategy to mock up the get_children method
2015-04-10 23:30:27 -04:00
Carlos de la Guardia
b315b4d747 MIT: CCX. Fixes for issues identified in code review
Switch to font awesome icons, to fix issue with toggling collapsible sections of the schedule in ccx coach dashboard

Ensure access check takes place after descriptor is bound to the user, or field override checks will never happen
2015-04-10 23:30:26 -04:00
Carlos de la Guardia
9ddee93401 MIT: CCX. Code Quality fixes
add doc strings; fix pep8 warning
address some minor issues brought up by the code review process
2015-04-10 23:30:26 -04:00
Carlos de la Guardia
b3da2a54bb MIT: CCX. Fix issues identified in code review
Original Commit Messages:

use edx's own get_parent method, rather than our own.

add field to unique constraint to avoid MultipleObjectsReturned in case of multiple browser clicks on submit

fix 0011 migration, inherit from TimeStampedField and add composite index (migration only)

fix bug where adding an already registered user to a ccx would cause a crash due to an undefined variable

add assertNumQueries tests to test modules where override field providers are used

remove unnecessary teardown

implement recommended style for checking empty list

import utility methods rather than use duplicate code

added comment explaining date conversion to string for json

add logging for invalid users or emails when enrolling students

add comment about xmodule user state

avoid using get_or_create, which seems to be causing a race condition on schedule change save

relocate badly placed edvent handlers to fix multiple submit problem
2015-04-10 23:30:26 -04:00
Carlos de la Guardia
3425424696 MIT: CCX. Use request thread local for access control decisions.
Use in tabs and other code to show or hide ccx coach tab depending on if the user has the coach role or not
2015-04-10 23:30:26 -04:00
cewing
7f691e4a92 MIT: CCX. Rename POC to CCX
Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
2015-04-10 23:30:25 -04:00
Carlos de la Guardia
97748e56ea MIT: CCX. Fix test failures
Django double-importing overwrites the TESTUSER object, invalidating identity comparisons.  Use a string instead to avoid the problem.

The get_current_poc function operates using a threadlocal and so no longer requires the user as an argument
2015-04-10 23:28:09 -04:00
cewing
0b184881f5 MIT: CCX. Implement display of CCXs in user-facing templates such as dashboard
Show the display name for the POC in the menu for switching.

Remove the MOOC: prefix from the MOOC title to avoid truncation issues.

Incorporate the display name of the POC into the display of course org/number/name at the top of the page in the default theme.

Provide warning on the grading policy page in system warning style.

Provide a PocMembership model api that returns PocMemberships for a user.  Default to active memberships.

Build generator that yields triplets of poc, membership and course for each poc membership a user has.

This is an analog of the `get_course_enrollment_pairs` in common/djangoapps/students/views.py and is used in the student dashboard to provide pocs as options for a student to view.

refactor to use model api instead of inline code.

provide pocs as possible targets for a student to visit from their dashboard.

Unset the current active poc when visiting the dashboard so as to avoid needing to switch active pocs when viewing a plain course.  This ensures we can leave template code for the display of courses unchanged.

Update templates to show pocs in a course-like view on a student's dashboard.

Revert a portion of the template change so that the poc title will still render properly when a poc is being viewed.
2015-04-10 23:28:09 -04:00
Carlos de la Guardia
bb7eed58db MIT: CCX. Refactore using backbone.js 2015-04-10 23:28:00 -04:00
cewing
96ca1da054 MIT: CCX. Increase test coverage
Improve testing of views and utils

Test api methods added to models.
2015-04-10 23:21:13 -04:00