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

36079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Qubad786
c1dec40cb5 check transcripts bfore using it 2016-04-01 18:59:21 +05:00
Clinton Blackburn
00b48e54a1 Exposing absolute/CDN image URLs via Course API 
ECOM-4013
 2016-04-01 09:42:57 -04:00
Asad Iqbal
9543989e57 Merge pull request #12012 from edx/asadiqbal08/updating-ubcpi-version-edxplatform 
asadiqbal08/WL-389: Update ubcpi XBlock version
 2016-04-01 18:29:23 +05:00
Cliff Dyer
393e885e4b Merge pull request #12015 from edx/cdyer/broken-master-20160401 
Fix broken import due to merging oauth changes to master
 2016-04-01 09:24:35 -04:00
David Ormsbee
8e42e61773 Merge pull request #12010 from edx/ormsbee/measure_login_page 
Add finished() metric for login and registration.
 2016-04-01 08:42:37 -04:00
sanfordstudent
6c4037b1cf Merge pull request #12002 from edx/sstudent/accordion_ 
making the accordion template escape by default
 2016-04-01 08:24:22 -04:00
J. Cliff Dyer
845b0261c0 Fix broken import due to merging oauth changes to master 2016-04-01 12:14:27 +00:00
Cliff Dyer
6917eb03cf Merge pull request #12009 from edx/merge-release-into-master 
Merge oauth release into master via intermediary branch
 2016-04-01 06:12:16 -04:00
Awais Jibran
75b8eae964 Merge pull request #11973 from edx/aj/ecom-3910-certification-exception-not-loading 
Fix certificate exception view.
 2016-04-01 14:48:36 +05:00
asadiqbal
177a237485 Wl-389 2016-04-01 13:02:16 +05:00
Omar Khan
b8dc2af3a7 Merge pull request #11871 from open-craft/omar/sso-icon-images 
Custom icons for SSO providers
 2016-04-01 12:35:39 +07:00
David Ormsbee
c11c663498 Add finished() metric for login and registration. 
Call New Relic's finished() event marker to measure when the login and
registration pages actually become usable. This is important because the
pageLoad event can be distorted by analytics and marketing tools that
trigger after the page looks complete to the user.

Note: The "xfinished" PageAction is there to work around a New Relic bug
where "finished" events weren't making it into Insights. The reason we
have both is because finished() *does* still show up in session traces.

[PERF-298]
 2016-03-31 23:21:28 -04:00