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

37647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muddasser
acef4fa29a Merge pull request #12819 from edx/muddasser/acceptance/setup.py 
Changed setup.py to ensure page objects have all the files needed whe…
 2016-06-28 17:39:41 +05:00
Jesse Zoldak
1136a06872 Merge pull request #12884 from edx/revert-12833-hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
Revert "TNL 4141"
 2016-06-28 07:19:58 -04:00
Jesse Zoldak
fcfacf22c8 Revert "TNL 4141" 2016-06-28 07:19:25 -04:00
hamzamunir7300
013bf65cc7 Merge pull request #12833 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
TNL 4141
 2016-06-28 13:11:54 +05:00
Tasawer Nawaz
e46764f5fc Merge pull request #12820 from edx/tasawer/bugfix/ecom-1730-make-student-enrollment-more-robust 
Make user enrollment more robust
 2016-06-28 12:47:23 +05:00
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
Ben Patterson
e7527fcabb Merge pull request #12854 from eduNEXT/jfavellar/TR-1194-fixtures 
Replacing relative imports by absolute imports for all files into com…
 2016-06-27 16:37:11 -04: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
alisan617
c9459eef79 Merge pull request #12873 from edx/alisan/deletebadfiles 
delete local pycharm files
 2016-06-27 15:04:50 -04: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
Simon Chen
8ad34c08b1 ECOM-4804 Add the organization logo url to the program details page (#12862) 2016-06-27 12:44:11 -04:00
alisan617
93395145dd delete local pycharm files 2016-06-27 12:11:23 -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
Tasawer
3a984d3ca2 Make user enrollment more robust 
ECOM-1730
 2016-06-27 14:51:09 +00: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
asadiqbal
0d32f71113 WL-538 changes to make UI responsive 2016-06-27 17:34:37 +05: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
Hamza Munir
8f329a70da removed the check if it is a string 2016-06-27 14:41:05 +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