Commit Graph

29641 Commits

Author SHA1 Message Date
Feanil Patel
b0dbe2f2da Be more specific about where we compile sass from.
There are now folders under static that have sass that should not be compiled
as a part of our asset pipeline,  they were getting pulled in because the wildcard
for `SASS_UPDATE_DIRS` was too broad.  This update makes it more specific for most
folders but leaves it broad for the common folder where the xmodule has its own sass
that needs compiling from a non-standard location.
2015-04-15 17:27:17 -04:00
Awais Qureshi
04ca163f82 Merge pull request #7690 from edx/awais786/ECOM-1420-new-field
ECOM-1420 adding new field and migration file.
2015-04-15 17:55:44 +05:00
Awais
18282919b5 ECOM-1420 adding new field and migration file. 2015-04-15 12:38:43 +05:00
Sarina Canelake
07b7c5c83a Merge pull request #7663 from applecool/edxsprint
Fix for TNL-1639
2015-04-14 19:40:52 -04: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
Will Daly
860cc8f2e4 Merge pull request #7669 from edx/will/fix-release-script-escaping
Escape curly quotes in release page table
2015-04-14 16:28:15 -04:00
Adam
d3bb72251e Merge pull request #7683 from edx/release
Release
2015-04-14 11:45:12 -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
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
Sarina Canelake
b3ab7fcea1 Merge pull request #7674 from applecool/authors
Added name to the authors list
2015-04-13 16:48:14 -04:00
applecool
74415858b1 Added name to the authors list 2015-04-13 16:39:44 -04:00
Christopher Lee
9bf8ae5b52 Merge pull request #7635 from edx/clee/MA-318
MA-318, change edx video id to video id
2015-04-13 14:55:56 -04:00
Matt Drayer
97f0cf108f Merge pull request #7577 from edx/mattdrayer/SOL-464
Add course-specific URL overrides for social sharing icons on student da...
2015-04-13 14:42:15 -04:00
Will Daly
c81bac956c Escape curly quotes in release page table 2015-04-13 14:22:58 -04:00
christopher lee
c42097b458 MA-318, change edx video id to video id 2015-04-13 13:31:37 -04: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
Martyn James
e1be8a526a Merge pull request #7655 from edx/dcikatic/SOL-570
SOL-570 Remove djangotracker from common imports - merging
2015-04-13 12:43:02 -04:00
Waqas Khalid
52488cae8c Merge pull request #7662 from edx/hotfix/2015-04-13
Revert hotfix for PLAT-452
2015-04-13 21:29:15 +05: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
Dino Cikatic
0fa86e3d5c SOL-570 Remove djangotracker from common imports 2015-04-13 11:58:37 -04:00
David Ormsbee
b1e8fcf614 Merge pull request #7560 from mcgachey/mcgachey-oauthlib-version
[Dependencies] Upgrading oauthlib from 0.6.3 to 0.7.2
2015-04-13 11:52:24 -04:00
applecool
c4cdfe210f Fix for TNL-1639 2015-04-13 11:41:07 -04:00
Sarina Canelake
2c7dd724b3 Merge pull request #7656 from louyihua/cms_i18n_1
i18n fix in studio
2015-04-13 11:30:33 -04:00
Syed Hassan Raza
08c6752722 Revert hotfix for PLAT-452 2015-04-13 20:20:19 +05: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
7a45d6e471 i18n fix in studio
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
2015-04-13 19:00:52 +08:00
louyihua
9a0da7d670 Better i18n
Combine sentences in several pages for better translation.
2015-04-13 13:10:23 +08:00
Sarina Canelake
b6265c4410 Merge pull request #7657 from edx/sarina/fix-typo
Fix typo: Certfificate -> Certificate
2015-04-11 23:46:04 -04:00
Sarina Canelake
293f256817 Fix typo: Certfificate -> Certificate 2015-04-11 18:24:37 -04:00
Sarina Canelake
d3122b0141 Change byte-sized bugs link 2015-04-11 14:59:47 -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
cewing
fbaab9674f MIT CCX: Prevent the discussion tab from displaying
When the POC feature is enabled and there is an active poc displaying discussions leads to undefined behaviors.  Hide the tab to prevent usability problems.
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
cewing
6f1a2ed531 MIT: CCX. Fix issues identified in code review
Remove over-cautious assertion and allow calling errors to be calling errors

fix problems in auto_enroll method

ensure that the active poc is wiped out if the user has no poc membership
2015-04-10 23:21:13 -04:00