Commit Graph

6095 Commits

Author SHA1 Message Date
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS.
TNL-2305
2015-07-03 20:58:40 +05:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
2015-07-02 18:52:15 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
2015-07-02 15:32:00 -04:00
Calen Pennington
012a3c7540 Merge pull request #8725 from openfun/regisb/fix_xblock_class_loading
Fix XBlock class loading in local resource view
2015-07-02 13:37:03 -04:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29
Merge back into master
2015-07-02 13:34:42 -04:00
Christine Lytwynec
0bb519c2a0 Merge pull request #8727 from edx/clytwynec/TE-878
use 1 coveragerc file to generate 1 coverage report per build
2015-07-02 12:13:59 -04:00
Andy Armstrong
281ebaa3b3 Merge pull request #8683 from edx/andya/run-optimized-devstack
Support running Studio with optimized assets
2015-07-02 11:39:37 -04:00
Andy Armstrong
85814f0bbf Support running Studio with optimized assets 2015-07-01 18:22:31 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04:00
Sarina Canelake
4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock
Add the Poll XBlock to the requirements.
2015-07-01 14:00:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Peter Fogg
890cd6a470 Add grading spec tests. 2015-07-01 09:08:39 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Albert Liang
4b332bfcf0 Add missing comma to tuple
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
2015-06-30 14:02:07 -07:00
Régis Behmo
bbe5494df1 Fix XBlock class loading in local resource view
Some XBlock classes were being (randomly) incorrectly loaded. This was
due to an error in the way the XBlock.load_class method was called.
Error was happening randomly because of the cache mechanism in the class
loading method. (see PLUGIN_CACHE)
2015-06-30 19:10:45 +02:00
Ali Mohammad
35f7cb75e4 Merge pull request #8715 from edx/resolve-merge-conflicts
Resolve merge conflicts
2015-06-30 11:00:50 -04:00
David Baumgold
a9c67c562e Merge pull request #8527 from edx/db/ensure-noseids-dir-exists
Ensure noseid dir exists when running tests
2015-06-30 10:03:56 -04:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components
TNL-2303
2015-06-30 13:26:18 +05:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29
Conflicts:
	requirements/edx/github.txt
2015-06-29 16:55:57 -04:00
Braden MacDonald
4e9db25281 Fix: users without course creation permission were not shown new library form 2015-06-29 13:14:04 -07:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475)
force save "download_video" field if not set

set timezone to UTC explicitly
2015-06-29 14:28:45 -04:00
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
Sarina Canelake
df0c56dde3 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-26 13:15:40 -04:00
Sarina Canelake
033d36c8f5 Merge pull request #8627 from Stanford-Online/nick/fix-tab-templates
Fix hint-problem tab bug TNL-2542
2015-06-26 13:11:46 -04:00
Nick Parlante
98730f3141 Fix hint-problem tab bug TNL-2542
Revert the removal of hint templates.
Move the 'tab' attribute in the new-problem yaml
files out one level, out of the 'metadata' section.
2015-06-26 09:22:04 -07:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info
User info cookie
2015-06-26 07:34:07 -07:00
Braden MacDonald
24af22ca88 Remove restrictions on library creation in Studio 2015-06-25 12:57:56 -07:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Andy Armstrong
aa76d9482a Update Bok Choy to use optimized static assets
TNL-2465
2015-06-25 09:58:27 -04:00
Will Daly
5e86a64729 User info cookie
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
2015-06-24 09:44:50 -07:00
Ahsan Ulhaq
0ae22a3b08 Credit Eligibility display on the CMS accessibility issues
There were some accessibility issues on the cms side which are addressed

ECOM-1594
2015-06-24 19:58:01 +05:00
Marco Morales
2dfca626a7 Merge pull request #8151 from edx/marco/capa-styling
Updated styling for basic capa problems (multiple choice, dropdown, checkboxes, numerical input and text input) including support for mobile app experience.
2015-06-24 09:05:34 -04:00
David Ormsbee
39ab0f31dc Cache SplitMongo course structures in memcached.
This is primarily to reduce load on MongoDB, where we've lately
had performance problems that we suspect are caused by very
large course structures being evicted from MongoDB's cache. This
may potentially give us a path to better performance as well,
but that's not the goal of this commit.

Surprisingly, LZ4 seemed to actually run more slowly than zlib
for this. Possibly because of some overhead in the Python
bindings? GZip was also surprisingly slow given that it uses
zlib underneath (something like 5x slower).

Use separate cache backend for caching structures.

Abstract out course structure cache.

add datadog metrics for compressed course structure sizes

Since we're using a different cache background, we don't need to have a cache prefix

Use dummy cache backend for tests.

Fallback to default cache if course_structure_cache doesn't exist.
2015-06-23 23:24:05 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
2015-06-22 13:55:53 -04:00
Andy Armstrong
9175a0c465 Merge pull request #8614 from edx/andya/fix-content-libraries
Use RequireJS Optimizer for content libraries
2015-06-22 13:47:05 -04:00
Sarina Canelake
c036aaf4d2 Remove Hints tab from Studio 2015-06-22 11:31:17 -04:00
Andy Armstrong
4c79a59b63 Use RequireJS Optimizer for content libraries 2015-06-22 11:30:36 -04:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page
ECOM-1523
2015-06-22 18:36:54 +05:00
utkjad
59e0d22fc3 Adding call stack manager 2015-06-19 20:43:26 +00:00
Diana Huang
5fb2a1fd8e Merge pull request #8583 from edx/diana/course-tab-cleanup
Make course tab refreshing safer.
2015-06-19 15:38:30 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Nimisha Asthagiri
84753740e3 Merge pull request #8570 from edx/mobile/video-upload-MA-844
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
2015-06-19 11:21:50 -04:00
Sarina Canelake
6d121dc5ad Merge pull request #6786 from Stanford-Online/nick/extended-hint
Extended hint features
2015-06-18 18:34:24 -04:00
Nimisha Asthagiri
26d4a15d63 MA-844 Video Upload: remove dependency on AssetMetaDataStore. 2015-06-18 18:28:48 -04:00
asadiqbal
58129031a5 SOL-939 Jasmine Tests 2015-06-18 14:26:47 +05:00
Nick Parlante
77f3069655 Extended Feedback and Hints for Problems
Extends the common capa response types (string, numeric, multiple
choice, checkbox, dropdown) with feedback and hint
capabilities. "Feedback" refers to feedback shown to the student when
they check the problem, looking at their specific answer. "Hints"
refers to a Hint button in LMS which the student can click at any time
to see hints for that problem. The implementation extends the markdown
syntax to include feedback and hints. There are new Feedback-and-Hint
specific templates in Studio when the author clicks to add a new
problem.
2015-06-17 16:25:04 -07:00
David Baumgold
372eb9085f Ensure noseid dir exists when running tests 2015-06-17 13:34:09 -04:00
Chris
d6aa1578c4 Merge pull request #7351 from Stanford-Online/kluo/remove-redundant-modal
Remove extra lean modal trigger
2015-06-17 08:55:34 -04:00