Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
36,091 Commits 1 Branch 0 Tags
dbee08c72178b74736bba2b248e9b4819e09cce3
Commit Graph

36091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
dbee08c721 Make Capa problems do initial load without AJAX. 
Before this commit, calling the student_view on a capa problem would
cause it to render an empty placeholder <div>, wait for the
DOMContentLoaded event to be fired, and then make AJAX requests to the
the problem_get handlers to retrieve the HTML it needed to render the
actual problems. This can significantly increase the end user load
times for pages, particularly when there are many problems in a
vertical.

This commit takes a very conservative approach and has the server side
add the rendered HTML into a new data-content attribute on the <div>
enclosing the problem. When Capa's JS initialization runs, it grabs
from that data-content attribute rather than reaching over the network
for an AJAX request.

I had attempted to make it somewhat smarter and push the rendered
problem straight into the document instead of relying on the
data-content attribute. This was faster, and should be our long term
goal. However, it caused odd bugs, particularly around MathJAX
rendering, and I never quite tracked the issue down. I'm still going
forward with these changes because it's significantly better than the
current situation that students have to deal with, and we can make the
JS more performant in a future iteration.

[PERF-261]
 2016-04-06 18:08:14 +05:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request 
Request API access.
 2016-04-04 22:56:49 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API. 
ECOM-3940
 2016-04-04 20:29:19 -04:00
Ned Batchelder
82e77049fa Merge pull request #11996 from edx/ned/i18n-dummy-compilejs 
Compile js strings when we make dummy strings.
 2016-04-04 14:57:20 -04:00
Nimisha Asthagiri
1c9a75b42e Merge pull request #12029 from openfun/regisb/fix_broken_french_ugettext_in_tests 
Fix broken French i18n in CMS tests
 2016-04-04 14:28:04 -04:00
John Eskew
35a235b348 Merge pull request #11899 from edx/jeskew/ccx_safe_templating 
Safe templating changes for CCX.
 2016-04-04 12:45:24 -04:00
Régis Behmo
e850ef2db2 Fix broken French i18n in CMS tests 
French ugettext method was being monkey-patched with a "XYZ " prefix in
all tests. This introduces a context manager to guarantee that the
function reverts to its original state after the unit test has ended
(successfuly or not).
 2016-04-04 18:28:26 +02:00
Omar Khan
66ac9b0185 Merge pull request #11849 from open-craft/omar/watch-assets 
Fix paver watch_assets
 2016-04-04 22:37:50 +07:00
Brian Jacobel
9baae2ff3f Merge pull request #11963 from edx/andya/upgrade-underscore-string 
Upgrade Underscore.string
 2016-04-04 11:35:40 -04:00
Vedran Karačić
5fafdbf5ec Merge pull request #12027 from edx/vkaracic/update-browser-link 
Update browser support link
 2016-04-04 17:33:29 +02:00
Cliff Dyer
11e8306a2e Merge pull request #12022 from edx/cdyer/make-task-of-uninstall 
paver uninstall_python_packages
 2016-04-04 11:13:22 -04:00
Vedran Karacic
66ff1667be Update browser support link. 2016-04-04 14:36:17 +00:00
John Eskew
3e40c9f843 Merge pull request #12019 from edx/jeskew/upgrade_to_django_1_8_12 
Upgrade to Django 1.8.12
 2016-04-04 10:32:26 -04:00
Brian Jacobel
6df9f3d5fb Add Brian Jacobel to AUTHORS 2016-04-04 10:18:45 -04:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00
Brian Jacobel
1ed5b4bda9 Remove usage of Underscore.string in edit-chapter.underscore 2016-04-04 10:18:44 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string 
FEDX-117
 2016-04-04 10:18:43 -04:00
John Eskew
13ef2b7d1a Safe templating changes for CCX. 2016-04-04 09:59:45 -04:00
Nimisha Asthagiri
f5ad6aaddb Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings 
Translate preferred languages in user account settings
 2016-04-04 09:31:35 -04:00
Ned Batchelder
f10a3c968e Merge pull request #12020 from edx/ned/fix-doc-links 
Fix links to moved sections of the developer guide
 2016-04-04 06:43:30 -04:00
M. Rehan
ceecae7bec Merge pull request #12001 from edx/mrehan/tnl-4236-nonetype-no-attr-keys 
TNL-4236 – Check for video transcripts before using it
 2016-04-04 14:48:27 +05:00
Régis Behmo
d2317be682 Translate available preferred languages in user account settings 
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
 2016-04-04 10:33:00 +02:00
Omar Khan
53642579ad Fix paver watch_assets 
- Update to latest version of watchdog.
- inotify doesn't work on nfs share in devstack. Use polling instead.
- Some editors (vim) do not trigger modify events in their default
  configuration. Rebuild assets on all filesystem changes, and debounce
  when changes happen too quickly.
 2016-04-04 12:36:07 +07:00
Clinton Blackburn
ed66a1d214 Merge pull request #12018 from edx/clintonb/ccx-keys-update 
Using edx-ccx-keys from PyPI
 2016-04-03 21:53:51 -04:00
Bill DeRusha
fb6f3a411b Merge pull request #11920 from edx/bderusha/st-wiki 
Safe Templatize: wiki templates
 2016-04-03 19:11:39 -04:00
Kelketek
ab0cbfffeb Merge pull request #10556 from edx/feature/badges-v2 
Badges V2 Feature Branch
 2016-04-01 17:06:26 -05:00
Jonathan Piacenti
f84f95c7ee Refresh DB caches. 2016-04-01 21:06:08 +00:00
Jacek Bzdak
09f5277f3b Some tests for badges js 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Clinton Blackburn
320abd7d24 Using edx-ccx-keys from PyPI 
ECOM-4016
 2016-04-01 16:59:02 -04:00
J. Cliff Dyer
f2ea041948 Allow paver users to uninstall obsolete python packages via a paver command. 
MA-2250
 2016-04-01 16:37:15 -04:00
Ned Batchelder
e2109b97db Run compilejsi18n when we make dummy strings 2016-04-01 15:52:27 -04:00
Ned Batchelder
a368982c14 Stop using roundabout ways of passing strings to cmd() 2016-04-01 15:52:27 -04:00
Ned Batchelder
d47f872ab7 Fix links to moved sections of the developer guide 2016-04-01 15:33:24 -04:00
John Eskew
e29e2f5ad1 Upgrade to Django 1.8.12 2016-04-01 14:27:20 -04:00
Usman Khalid
343bb3e9af Merge pull request #12017 from edx/notes-jwt-issue 
Removing check from edx notes settings for OAUTH token timeout.
 2016-04-01 21:06:20 +05:00
Jonathan Piacenti
ca959ab1d1 Patch for badge migrations to fix date specificity change. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
1a6394b781 Add share modal to badge listing. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
ccb5b6c74c Adjust get_completion_badge usages to handle exceptions. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
4fde73fae3 Address notes. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cb4ed42075 Disable badge issuance for courses where badges are disabled. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cff9343889 Change issuing_component for included badge events. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
a2104634a1 Implement Badging API views. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
61c76771f8 Add completion and enrollment badges. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
25958febbf Add XBlock Badging Service. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
112a143589 Refactor badging, move into its own app. 2016-04-01 10:13:08 -05:00
muzaffaryousaf
ce142eb378 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-01 20:01:46 +05:00
Muzaffar yousaf
cc4349e9ae Merge pull request #11990 from edx/mzfr/prvw-masqrd-tnl4291 
Staff should be able to masquerade when previewing content.
 2016-04-01 19:42:58 +05:00
Clinton Blackburn
c921f2ac90 Merge pull request #12011 from edx/clintonb/course-api-image 
Exposing absolute/CDN image URLs via Course API
 2016-04-01 10:31:59 -04:00