Commit Graph

6092 Commits

Author SHA1 Message Date
Ali Mohammad
54f62a85f6 Merge pull request #8224 from Stanford-Online/kluo/course-creation-after-deletion
Allow course creation after deletion at same URL
2015-06-16 11:24:50 -04:00
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests
A version of #8260 that is consistent on jenkins and locally
2015-06-15 11:51:33 -04:00
Calen Pennington
e4bc328c3a Reduce the number of queries when walking parents in MongoModuleStore by avoiding cache misses on the data due to missing runs 2015-06-15 11:09:43 -04:00
Calen Pennington
1422db5cb4 Allow check_sum_of_calls to measure methods as well as pure functions 2015-06-15 11:07:53 -04:00
Calen Pennington
7da8eb1fdb Delay constructing the set of mongo calls until they're needed 2015-06-15 09:50:45 -04:00
Calen Pennington
984eb0a436 Use the more abstract api for parsing UsageKeys in mongo/base.py 2015-06-15 09:50:44 -04:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Calen Pennington
83fce4d61f Merge pull request #8395 from jazkarta/ccx-custom-ids
MIT CCX: Use CCX Keys
2015-06-12 16:19:12 -04:00
cewing
cb431ccb24 MIT CCX: Use CCX Keys: further revisions in response to code review
only require ccx-keys once

get_current_ccx will now expect a CourseKey instance as its argument, and will raise a value error if this expectation is not met.

document reason for local import

add special methods to pass attribute setting and deletion through to the wrapped modulestore

add __setattr__ and __delattr__ per code review, update __init__ to work with new methods

style change per code review

clean up context manager usage as recommended by code review

remove unused code and imports

convert modulestore type tests to use the `get_modulestore_type` api, remove unused imports

code quality: add docstrings

increase coverage for utils tests

fix bug found in testing.

increase test coverage on modulestore wrapper

code quality fixes

code-quality: ignore import error, but mark site for future consideration
2015-06-12 11:20:30 -07:00
Usman Khalid
eb81e52dc4 Merge pull request #8477 from edx/usman/plat676-bulk_operations-2
In bulk_operations() exit, emit signals at the end.
2015-06-12 21:08:24 +05:00
Nimisha Asthagiri
89ea8b31c6 MA-725 responsive_ui indication on responsive xBlocks. 2015-06-12 09:27:21 -04:00
Nimisha Asthagiri
4921ec48c8 MA-792 Course Blocks and Navigation API (user-specific) 2015-06-12 09:27:20 -04:00
Nimisha Asthagiri
037ef3be77 Video module support for student_view_json. 2015-06-12 09:27:17 -04:00
Nimisha Asthagiri
65e330e8b5 Make RequestCache reusable 2015-06-12 09:27:16 -04:00
cewing
6a0c9aee9d MIT CCX: Use CCX Keys
Implement the use of CCX opaque keys throughout the ccx code base

include the new custom ccx id package in the github checkouts list

update the coach dashboard wrapper to get CCX information from the incoming course_id, if possible

update function signatures for all view functions to expect CCX as passed by the dashboard wrapper (default to None), remove calls to get_ccx_for_coach as the ccx is passed in.

update reverse calls in python view code to use a CCXLocator for the URL instead of a CourseLocator

use CCXLocator where necessary

use course id to find ccx, instead of thread local

remove unused method and related tests

use course id for getting ccx

provide course id to the get_current_ccx method

ensure the course id passed in is a CourseKey instance of some type whether it starts out as a string or not

use the provided block to figure out what the course_id should be, then get the ccx for that

redirect to ccx dashboard using coach ccx if no ccx is passed in

update student dashboard listing for ccx to build an appropriate url from a CCXLocator, not from the course locator.

refactor building the ccx locator so we don't have to do it repeatedly

begin test refactoring after ccx_keys introduction

Ensure that when access checking happens, the course_locator form of a ccx locator is used.  This ensures that the access check happens against the course and it is not necesarry to duplicate the entire access control structure for the course.

pick up api change in ccx-keys

create and conditionally use a wrapper for the mixed modulestore returned by xmodule.modulestore.django.modulestore

the wrapper will strip and restore ccx values from CourseKey and UsageKey objects

fix return values on a few methods

remove unused symbol

pull updated ccx-keys package

set course_id on the caching descriptor system to avoid api incompatibilities in some subsystems

use ccx.course instead of self.course

fix get method to find course keys from blocks that are not themselves keys but have a location attribute (which will be a key)

if an item coming out of the db has children, restore the ccx to them as well

if the block passed in has a CCX key, unwrap that before we try to look up the override, otherwise it will never be found.

pick up a change in the ccx keys package that allows for stripping CCX identity from a usage key

begin writing tests to cover this modulestore wrapper

remove the switch_pocs view, the url pattern for it, and the tests that covered it

remove the ccx context and the middleware responsible for setting the current CCX.  These are no longer needed

all dashboard views should raise 404 if a ccx is not provided by the coach_dashboard decorator

code quality

prevent errors resulting from trying to `get` a ccx based on non-unique criteria.

remove obsolete usage of ACTIVE_CCX_KEY

fix setUp method for grading tests to properly create grades for the ccx rather than for the course.

clean up reverse calls

code quality

adding docstrings to clarify purpose of this patch

fix bug in getting ccx for coach

fix grading views to properly fetch a ccx-ified course so that grades for that version will be calculated

fix small errors in modulestore implementation

fix errant merge marker

update call to get_current_ccx after key refactoring merged with tab changes
2015-06-12 00:01:24 -07:00
Usman Khalid
5ab2e86988 In bulk_operations() exit, emit signals at the end.
PLAT-676
2015-06-11 23:57:48 +05:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Syed Hassan Raza
ecc3473d36 transcript name param url 2015-06-09 20:04:16 +05:00
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end
pause_video event does not emit when a video ends
2015-06-09 16:18:51 +05:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab.
TNL-2321
2015-06-08 15:18:39 -04:00
Adam
d0f7a08cc4 Merge pull request #8408 from edx/release
Release
2015-06-08 11:00:20 -05:00
Waheed Ahmed
f9fe00ff6c Fixed youtube video was not loading even youtube is available.
TNL-2361
2015-06-05 22:42:26 +05:00
Calen Pennington
7c0709ce5b Merge pull request #8322 from cpennington/document-read-metrics
Add metrics around all split-mongo database operations measuring coun…
2015-06-04 10:08:10 -04:00
Colin-Fredericks
cc2d4cad01 DOC-2044 Fixing factor-of-ten error 2015-06-04 07:14:28 -04:00
Calen Pennington
94185e9c6f Add metrics around all split-mongo database operations measuring count, duration, and approximate size
[PLAT-645]
2015-06-04 07:12:45 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a
TNL-1897: Implement Course Team API, Part A
2015-06-03 14:59:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Shrhawk
ef500514c1 Merge pull request #7970 from edx/shr/bug/TNL-2038-Remove-table-of-contents-transcript-languages
Remove "table of contents" from transcript upload languages
2015-06-03 22:39:39 +05:00
Awais Jibran
8956b4037d 'pause_video' event should emit in addition to the 'stop_video' when user watches the video completely (For Youtube videos)
TNL-2167
2015-06-03 18:33:23 +05:00
Chris Dodge
1e371bbbae set default on is_entrance_exam 2015-06-02 21:41:40 -04:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions
Add extensible course view types for edX platform
2015-06-02 17:08:45 -04:00
Kelketek
cda26bb94d Merge pull request #8173 from edx/badges
OpenBadges MVP (SOL-768)
2015-06-02 14:30:59 -05:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Jonathan Piacenti
81877300cd Implement OpenBadge Generation upon Certificate generation through Badgr API 2015-06-02 18:32:50 +00:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Sarina Canelake
9008548c25 Merge pull request #8207 from amir-qayyum-khan/add_ccx_enable_to_settings
Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms
2015-06-02 11:52:17 -04:00
amir-qayyum-arbisoft
6a41cd7bfa Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms 2015-06-02 19:43:42 +05:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -04:00
Syed Hassan Raza
dc13bbe1d6 Remove table of contents 2015-06-02 18:40:00 +05:00
Matt Drayer
af7277cdd9 New Feature: Certificates Web View
- SOL-465: Initial implementation of certificates web view and signatories (names/titles)

- SOL-718 Close button is working properly

- SOL-801 Backbone Signatories Modeling

- SOL-803 Underscore template: Editor (Add)

- SOL-802 Signatories: Underscore template - Details

- SOL-804 Signatories: Underscore template: Editor (Edit)

- Add signatory delete Django view

- SOL-805 Signatory editor (Delete)

- Add Coffeescript router

- SOL-716 Jasmine Tests

- Added missing minified JS library

- client side validation of signatory fields

- SOL-390 signatories names

- Remove obsolete extends Sass files

- input maxlength limiting for signatory information

- SOL-389: Course title override

- SOL-466: Add capability to upload digitized signatures in Studio

- ziafazal: fixed css for upload signature image

- ziafazal: completed deletion of signature images

- UX-1741: Add initial static rendering/styling for Open edX web certs
  * creating new global static dir
  * adding static version of edX UX pattern library assets
  * adding web certificates static assets
  * adding static (+abstracted) web certificates rendering
  * creating two tiers of rendering (base + distinguished)
  * providing sample assets for certificate rendering
  * supporting RTL layouts
  * adding certifcates assests to edX static asset pipeline
  * temporarily hiding the mozilla open badges share action
  * wiring print button to print view/page
  * fixup! addressing conflict artifact in valid cert template
  * fixup! adding missing %hd-subsection sass extend + components comment clean up
  * fixup! correcting pattern library .hd-4 font-weight value

- SOL-468 Linked Student View for Web View Credential

- SOL-467: Add capability to upload organization logos for certificates

- SOL-391 / SOL-387: Signatory related info (assets) in certificates web view

- kelketek: Fixes for static asset collection in certificate HTML view.

- SOL-398 Web View: Public Access

- mattdrayer: Post-merge branch stabilization

- catong: Initial changes to Studio template and Help config file

- ziafazal: Branch stabilizations

- SOL-387: Display organization logo on LMS web view

- talbs/mattdrayer: Branch Stabilizations

- talbs: converting backpack action to use a button HTML element

- talbs: revising placeholder assets + their rendering in cert view

- mattdrayer: Username web view wireup

- SOL-386 Certificate Mode Previews

- SOL-905: Make organization logo and signatory signature uneditable

- SOL-922: Improve test coverage

- SOL-765: Add LinkedIn sharing

- [marco] temporary styling adjustment to account for smaller linkedin share image / fake button

- SOL-921: Address hardcoded template items

- SOL-927: Deleting certificate should delete org logo image also
  * updated invalid template
  * removed hr
  * fix invalid certificate error

- clrux: Add i18n to certificate templates and partials

- mattdrayer: Pylint violations

- SOL-920 Certificate Activation/Deactivation

- mattdrayer: Added LMS support

- SOL-932: Fix preview mode support in certificate view

- SOL-934: Fixed bug reported and broken tests

- SOL-935 removed the 'valid' word from web view title

- talbs: RTL support updates/fixes
  * revising certificate type icon/name vertical alignment
  * removing unused older certificate template
  * revising styling for message/banner actions
  * abstracting accomplishment type to use course mode + adding in honor/verified-specific placeholders

- mattdrayer: JSHint violations
2015-06-01 19:48:04 -04:00
Daniel Friedman
f81d09cbdb Merge pull request #8254 from edx/dan-f/enable-tinymce-spellcheck
Enable the browser's spellcheck in tinymce
2015-06-01 17:08:08 -04:00
Alexander Kryklia
ef8f391888 Merge pull request #7825 from edx/alex/video_bumper
Alex/video bumper
2015-06-01 23:07:05 +03:00
Daniel Friedman
c26b958fd0 Enable the browser's spellcheck in tinymce
TNL-1621
2015-06-01 14:05:49 -04:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
2015-06-01 10:45:51 +02:00
Sarina Canelake
be8eed65c8 Internationalize help text 2015-05-31 17:22:52 -04:00
Sarina Canelake
1237ee6b37 Add correct_or_past_due option for showanswer help text (ref bbeb79cb) 2015-05-31 17:22:51 -04:00
Alexander Kryklia
4c7bfb44dd Add Video Bumper.
Fix n-click behaviour on poster.
Fix unit tests.
Fix handler for non_en lang for bumper.
Add more tests.
Fix docstrings.
Fix pep8.
Fix static redirection with bumper.
Fix button in IE11.
Add video_bumper field in bok_choy.

Fix pylink violations.

Update docstrings and some clean up.

Rename edx_video_id in bumper tests.

Fix too long lines in help text.

Address ui comments.

Fix bumper events.

Refactor bumper-transcripts code, fix bugs, address comments.
Squashed commits:
Fix download transcript button.
[74e0c8c] Fix quality
[a759f33] Fix error, when sub contains extension.
[b30755c] Revert "Add video files to host for transcripts."

This reverts commit cf8a96bf84346e17b6ad57ad4cc6a27d7a9118cd.
[36f038a] Add video files to host for transcripts.
[23f1655] Fix pep8 and pyling issues.
[0f1f9d2] Update acceptance test.
[765a27d] Wait for ajax in captions.
[8ae72a3] Fix logic.
[063450f] Fix unit tests.
[d1075fc] Fix handlers tests.
[25d31ad] Update bumper_utils.
[cb5f9df] Remove maxDiff.
[8738b1a] Code cleanup.
[87dbcb7] Fix issues with transcripts.
[ec899de] Fix transcripts in serializers.
[444b1fc] Fix transcripts typo.
[d524cb5] Fix bumper.
[f62cf22] Fix video mongo tests.
[8f1b55a] Fix dispatches.
[53bc308] Add more fixes.
[d5e3723] Fix test_video_handlers and rename the method.
[93efc23] Fix mobile tests.
[740e2ae] Fix pep8 and pylint.
[47cfb66] Address comments, add fixes.
[4e499d9] Add fixes.
[8353553] Add improvements.

Updated dispatch values)
.

Use ddt in bumper handler tests.

Move common metadata to single place.

Fix style.

Update docstring.

Fix poster button.

Improve bumper events.

Fix test after rebase.

Address comments.

Download transcript: use def video lang, not bump.

Renamed date_last_view_bumper to bumper_last_view_date.

Rename do_not_show_again_bumper to bumper_...

Address comments.

Fix tests for download for en lang.

Fix bumper logic.

Update strings.

Update resizer.

Remove resizer.

Fix unit tests.

Add tests.

Fix bumper events.

Clean up tests.

Fix pylint violations.

Fix pep8 and pylint violations.

Update docs and method names.

Update events.

Make /static/ prefix a must.

Fix wrong code.
2015-05-31 14:45:31 +03:00
Adam Palay
e3976f7e98 Merge remote-tracking branch 'origin/release' into merge-release-to-master 2015-05-29 19:47:12 -04:00
Adam Palay
0aba5874e6 Revert "Fieldset and legend solution is lost when edit Problem"
This reverts commit 16a248b997.
2015-05-29 18:50:34 -04:00
John Eskew
a0675a16d0 Merge pull request #8281 from edx/release
Merging hotfix-2015-05-29 from release to master
2015-05-29 18:32:46 -04:00