Commit Graph

5992 Commits

Author SHA1 Message Date
Daniel Friedman
9e90ec5c0a Correct "shure" to "sure" in a comment 2015-04-29 16:05:43 +00:00
David Baumgold
28c898c395 Correct spelling in a comment 2015-04-29 11:27:07 -04:00
Chris
d9e13d22b8 Merge pull request #7763 from edx/clrux/sequence-nav-button-icons
Changing sequence nav buttons from images to icon fonts
2015-04-28 14:05:38 -04:00
Chris Rodriguez
74ce5cbb87 Changing sequence nav buttons from images to icon fonts 2015-04-28 11:04:16 -04:00
Mark Hoeber
356b10c271 Update component templates for accessibility and content 2015-04-27 14:45:36 -04:00
Waqas Khalid
97e6091bd7 Tab number in url doesn't take to correct tab
When there is multiple units in a particular subsection
then there will be tabs in courseware. When url have
tab number at the end of the url the code was not
considering it and showing the wrong tab. I have changed
such that it will always check the value of position.

TNL-1844
2015-04-24 17:50:32 +05:00
Sarina Canelake
8006227aa6 Merge pull request #7667 from applecool/L10N_bugfix
Fix to LOC-66
2015-04-23 10:48:15 -04:00
applecool
3f11df3f34 Fix to LOC-66 2015-04-22 20:45:44 -05:00
Chris Rodriguez
b9a30b226e RTL-ifies the sequence nav buttons 2015-04-22 09:52:12 -04:00
Nimisha Asthagiri
c2a1870fb5 Clean ID of course_module for push notification channel name.
Update Mobile API to include channel_id for course.
2015-04-18 15:30:19 -04:00
Calen Pennington
f67cb76fb4 Merge pull request #7686 from cpennington/xmodule-metrics-sample-rate
Sample xblock metrics at 10%
2015-04-17 13:52:05 -04:00
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
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search
Capa problem type filtering using edx-search
2015-04-17 18:43:04 +03:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
David Baumgold
1c910023aa Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop
hard start/stop times to video player
2015-04-15 16:42:24 -04:00
ataki
2c6226362e Warning that hard start/stop times don't work for mobile 2015-04-15 14:47:42 -04:00
Sarina Canelake
07b7c5c83a Merge pull request #7663 from applecool/edxsprint
Fix for TNL-1639
2015-04-14 19:40:52 -04:00
ataki
5f5a77acb1 Add comment, refactor, handle edge cases 2015-04-14 15:56:56 -04:00
ataki
27d3d0344d Update variable names for video module 2015-04-14 15:56:56 -04:00
ataki
5917ed063d hard start/stop times to video player
This pull request makes the video player module respect
the video start/stop times specified by the instructor
as a hard start/stops, i.e. the video treats the start
time as the beginning of the video and the stop time as
the end.

Previously, the video module displayed the full
video and displayed a jquery ui slider range representing
the start and end times.

This new functionality invalidates two previous acceptance
tests for the video module:

    - slider visible test
    - finish time video acceptance test.

These tests are removed from the common acceptance tests.
2015-04-14 15:56:56 -04:00
Calen Pennington
d9630c7c76 Sample xblock metrics at 10% 2015-04-14 13:46:32 -04:00
Adam
d3bb72251e Merge pull request #7683 from edx/release
Release
2015-04-14 11:45:12 -04:00
E. Kolpakov
75d61b6fa2 Renamed course_key to structure_key to reflect the fact it might be a library key as well. 2015-04-14 14:43:37 +03:00
E. Kolpakov
9bbad95497 Moved library key normalization into library_tools module, fixed library update task test 2015-04-14 14:43:37 +03:00
E. Kolpakov
77cc80f6b6 Added code to fire library_updated signal when library is updated 2015-04-14 12:41:24 +03:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes
Added task and signal to fire library reindex
2015-04-14 12:40:05 +03:00
E. Kolpakov
d34c6a0783 Filtering using search index + tests 2015-04-14 12:32:50 +03:00
E. Kolpakov
2f03b97636 Index dictionary for CapaDescriptor + extending tests to cover it 2015-04-14 12:32:49 +03: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
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
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
Dino Cikatic
0fa86e3d5c SOL-570 Remove djangotracker from common imports 2015-04-13 11:58:37 -04:00
applecool
c4cdfe210f Fix for TNL-1639 2015-04-13 11:41:07 -04:00
Syed Hassan Raza
08c6752722 Revert hotfix for PLAT-452 2015-04-13 20:20:19 +05: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
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
Chris Rossi
aa1333c363 MIT: CCX. Hide course blocks not in the CCX from view for coaches and students 2015-04-10 23:13:11 -04:00
Chris Rossi
a2cb7fd276 MIT: CCX. Implement Custom Courses for Edx.
This feature provides the ability to designate a "coach" who can create customized runs of an existing course, invite students to participate, and manage students through the run of the course.

In this squashed commit we implement the initial scifi, add the 'POC Coach' course role, refine the scifi, add migrations for models, create POCs, enforce POC Coach role, provide panels for Coach Dashboard, set up rudimentary display of course outline, add and remove units, show/hide all units, and save schedule changes, set dates when adding units, edit dates on units already added and provide some tests.

We also provide mechanisms for invitation and enrollment in a POC (to become CCX) and control the display of blocks to students in a POC.
2015-04-10 23:10:48 -04:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Calen Pennington
2c080af646 Merge pull request #7603 from cpennington/xblock-metrics-block-type
Add the entry-point used to load an XBlock to the tags when recording me...
2015-04-08 16:35:33 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release
Release
2015-04-08 15:40:45 -04:00
Calen Pennington
29c9080bdf Add the entry-point used to load an XBlock to the tags when recording metrics on rendering and handling 2015-04-08 13:00:27 -04:00