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

14522 Commits

Author SHA1 Message Date
Asad Iqbal
85b1f23a18 Merge pull request #12868 from edx/asadiqbal08/WL-538 
WL-538 changes to make UI responsive
 2016-06-28 11:59:59 +05:00
Ahsan Ulhaq
a980361aa6 Merge pull request #12867 from edx/ahsan/ECOM-4792-Incorrect-links-on-edX-Course-Catalog-API 
Incorrect links on `edX Course Catalog API`
 2016-06-28 00:05:30 +05:00
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
Chris Rodriguez
62a6f891c4 AC-398 putting edx.org social media links in list, updating styles 2016-06-27 11:31:42 -04:00
Ahsan Ulhaq
f6fdd3c499 Incorrect links on edX Course Catalog API 
ECOM-4792
 2016-06-27 19:53:37 +05:00
asadiqbal
0d32f71113 WL-538 changes to make UI responsive 2016-06-27 17:34:37 +05: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
Chris
65bca48e94 Merge pull request #12825 from edx/clrux/tnl-4853 
TNL-4853
 2016-06-24 14:27:36 -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
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -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
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
J. Cliff Dyer
d2670a1110 Certificate Tests: remove EventTrackingTestCase when unneeded 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
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
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
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
George Schneeloch
f8da2f1e37 Edited docstring to have URL match urls.py 2016-06-23 16:01:49 -04:00
Adam Palay
07f5bacce2 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 55d84d34b8.
 2016-06-23 14:13:48 -04:00
Ned Batchelder
dd9139374f Update translations (autogenerated message) 2016-06-23 15:29:59 +00:00
E. Kolpakov
2b8c02a759 Discussion coffee files to JS 2016-06-23 11:05:36 -04:00
Clinton Blackburn
d7c570aacd Corrected name of static file (#12817) 
ECOM-4610
 2016-06-22 15:07:40 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00
Douglas Hall
7b86da02f7 Check theme overrides when retrieving platform name from settings 2016-06-22 13:54:57 -04:00
Michael Frey
ad45681a53 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys 
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
 2016-06-22 13:54:56 -04:00
mdinino
0a7c534d56 Merge pull request #12824 from edx/release 
Release
 2016-06-22 11:31:34 -04:00
Michael Frey
48b80b519f Merge pull request #12811 from edx/mjfrey/micro-settings-merge 
mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys
 2016-06-22 08:31:50 -04:00
Syed Hasan raza
01c8b3499c Merge pull request #12790 from edx/shr/bug/ECOM-4645-Certificate-exception-whitelisted-users 
exception_handling_for_unverified_cert_status
 2016-06-22 15:46:49 +05:00
Syed Hassan Raza
5f7cdcd30a exception_handling_for_unverified_cert_status 2016-06-22 13:33:40 +05:00
Michael Frey
6efc461fb6 mjfrey/micro-settings-merge: Override base dictionary keys with microsite configuration keys 
* mattdrayer: Add helpers.get_value test
* mattdrayer: Change to simpler implementation, per @douglashall
* mattdrayer: Address quality violations and test failures
 2016-06-21 23:28:36 -04:00
Renzo Lucioni
a240780b85 Merge pull request #12768 from edx/alasdair/ECOM-4224-certificate-messaging-for-program-course-cards 
Front End for certificates
 2016-06-21 16:58:15 -04:00
AlasdairSwan
619829d5b5 Program details front end for certificates 
Part of ECOM-4224.
 2016-06-21 13:20:40 -04:00
Andy Armstrong
037e27b268 Merge pull request #12208 from edx/andya/use-ui-toolkit-helpers 
Use the UI Toolkit's spec helpers
 2016-06-21 10:55:26 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Awais
7ae64b4fb6 If support user re-generates the cert. Removes the invalidation entry if exists. 
ECOM-4199
 2016-06-21 14:08:56 +05:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Brian Jacobel
6aba6219c3 Add a third fixed case where images could overflow (refs #12735) 2016-06-20 16:32:52 -04:00
Andy Armstrong
519ebed615 Merge pull request #12780 from edx/andya/remove-coffeescript 
Convert XBlock runtime code from CoffeeScript
 2016-06-20 10:39:45 -04:00