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

37630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia Pearce
ce3da57546 Merge pull request #12783 from edx/sylvia/DOC-2361 
Account registration and activation text string revisions
 2016-06-27 15:01:36 -04:00
Chris
e90dad8af5 Merge pull request #12860 from edx/clrux/ac-398 
AC-398 putting edx.org social media links in list, updating styles
 2016-06-27 13:50:21 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Simon Chen
8ad34c08b1 ECOM-4804 Add the organization logo url to the program details page (#12862) 2016-06-27 12:44:11 -04:00
Chris Rodriguez
62a6f891c4 AC-398 putting edx.org social media links in list, updating styles 2016-06-27 11:31:42 -04:00
alisan617
f9edd4e8e5 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-27 09:17:11 -04:00
alisan617
8ea177f9c9 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update packages.xml 2016-06-27 09:17:09 -04:00
Awais Jibran
4f10552add Merge pull request #12834 from edx/aj/ecom4775-change-bulk-enroll-mgm-cmd 
Fix `bulk_change_enrollment` command to emit event
 2016-06-27 17:33:18 +05:00
Awais Jibran
4267666711 Fix bulk_change_enrollment command to emit event 
ECOM-4775
 2016-06-27 11:43:01 +05:00
alisan617
c526d57947 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-24 20:02:21 -04:00
Ned Batchelder
35267e4777 Merge pull request #12835 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-24 16:38:29 -04:00
Douglas Hall
32798f5422 Merge pull request #12861 from edx/douglashall/bump_safe_template_thresholds 
Bump safe template linter thresholds to fix failing builds
 2016-06-24 16:36:27 -04:00
Renzo Lucioni
67c39aa35a Merge pull request #12849 from edx/renzo/include-certificate-urls 
Include link to shareable run mode certificate, when available.
 2016-06-24 16:27:11 -04:00
Douglas Hall
826d791bca Bump safe template linter thresholds to fix failing builds 2016-06-24 15:15:55 -04:00
Chris
65bca48e94 Merge pull request #12825 from edx/clrux/tnl-4853 
TNL-4853
 2016-06-24 14:27:36 -04:00
Renzo Lucioni
3ceba5622c Include link to shareable run mode certificate, when available. 
Part of ECOM-4224.
 2016-06-24 14:04:52 -04:00
Nimisha Asthagiri
525e047533 Merge pull request #12857 from edx/tnl/grading-query-fixup 
Grading followup
 2016-06-24 13:42:01 -04:00
Chris Rodriguez
f9b8865367 Hiding focus outline on programmatically focusable els 2016-06-24 12:50:33 -04:00
Douglas Hall
10214839d6 Merge pull request #12856 from edx/douglashall/merge_patch_2016_06_22_to_master 
Merge patch-2016-06-22 release to master
 2016-06-24 12:27:55 -04:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Christopher Lee
d794fc5c4d Merge pull request #12842 from edx/clee/update-oauth 
Upgrade edx-oauth2-provider to v1.1.3
 2016-06-24 10:58:47 -04:00
Kevin Falcone
de7c993921 Merge pull request #12828 from edx/jibsheet/pa11y-version 
Convert to tag syntax for version
 2016-06-24 10:45:50 -04:00
Nimisha Asthagiri
a7a6fa77fe Grading followup 
1. update query counts with more accuracy
2. don't use defaultdict in block_structure
 2016-06-24 09:07:45 -04:00
Nimisha Asthagiri
1798b1f1bc Merge pull request #12567 from edx/tnl/grading 
Grading uses Block Transformers
 2016-06-24 09:01:30 -04:00
christopher lee
084a5bdddd Upgrade edx-oauth2-provider to v1.1.3 2016-06-24 08:15:22 -04:00
Chris
b42a9ff4d9 Merge pull request #12716 from edx/clrux/ac-484 
AC-484 changing aria- to data-, a to button
 2016-06-24 06:19:46 -04:00
Douglas Hall
1fcf32cf24 Merge pull request #12822 from edx/patch/2016-06-22 
Patch Release 2016-06-22
 2016-06-24 05:50:51 -04:00
Nimisha Asthagiri
7fe002ff82 Improve error handling in Split Modulestore 2016-06-24 00:46:01 -04:00
J. Cliff Dyer
d2670a1110 Certificate Tests: remove EventTrackingTestCase when unneeded 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
8513e823bc Add block_metadata_utils 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
57dde6516a Update ENABLED_CACHES values 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
fb120426e0 Fix Typos 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
d0fcabd407 CCX: Use Modulestore Field Overrides instead of User-specific Overrides 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Nimisha Asthagiri
1fbb4b8b25 Update BlockStructure API 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
f016647fef Enable Block Transformer Registry in tests 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
85687dcf60 Enable Grade Transformer 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
02e6925275 Update grades to use Block Structures 2016-06-23 20:22:31 -04:00
Chris Rodriguez
76df13487c AC-484 removing aria-activedescendent 2016-06-23 19:55:28 -04:00
raeeschachar
469dac6f90 Merge pull request #12830 from edx/raees/bokchoy-test-default-sort-preference 
Fixed test default sort preference failing on chrome
 2016-06-24 03:09:05 +05:00
Renzo Lucioni
157c68506d Merge pull request #12836 from edx/renzo/switch-cert-icon 
Use SVG cert icon for program detail page certificate section
 2016-06-23 17:28:45 -04:00
Eric Fischer
d3128f4d36 Masquerading staff override hidden special exams [TNL-4808] (#12806) 
Allows staff using "view as specific student" mode to bypass edx-proctoring
hiding special exams from students, to allow for more useful debugging.

Includes "shim" pattern library implementation of alerts, and a bokchoy
test for this functionality.
 2016-06-23 16:54:57 -04:00
raeeschachar
c07cb1905c Fixed test default sort preference failing on chrome 2016-06-24 01:46:14 +05:00
Renzo Lucioni
c151761e64 Use SVG cert icon for program detail page certificate section 
Part of ECOM-4224.
 2016-06-23 16:39:58 -04:00
Andy Armstrong
518a428f54 Merge pull request #12845 from edx/andya/fix-discussion-jasmine-tests 
Add back and fix missing discussion Jasmine tests
 2016-06-23 16:28:00 -04:00
Ned Batchelder
8e57e248c3 Merge pull request #12846 from mitocw/gs/fix_certificates_comment 
Edited docstring to have URL match urls.py
 2016-06-23 16:25:46 -04:00
George Schneeloch
f8da2f1e37 Edited docstring to have URL match urls.py 2016-06-23 16:01:49 -04:00
Andy Armstrong
ac977ba4ce Add back and fix missing discussion Jasmine tests 2016-06-23 15:43:04 -04:00
Toby Lawrence
959c97d74a Merge pull request #12821 from edx/PERF-341 
[PERF-341] Don't rewrite XBlock resource URLs.
 2016-06-23 15:33:07 -04:00
Douglas Hall
e2fd776aab Upgrading edx-proctoring to 0.12.21 to pull in additional fix 2016-06-23 15:27:36 -04:00