Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
PaulWattenberger
aa078dfda2 Pwattenberger/sailthru enroll (#12816) 
* Partial changes for purchase tracking

* Continued changes for purchase tracking

* Clean up code quality issues

* Clean up code quality issues

* Responses to code review

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix code quality flaged issues

* Fix problem processing sailthru_content cookie
 2016-06-28 11:13:21 -04:00
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00:00
Eric Fischer
664cafc962 Combine get_course_blocks() calls for grading performance (#12877) 
When getting progress, we need these blocks in two locations. They
do not need to be individually fetched.
 2016-06-28 10:03:58 -04:00
Calen Pennington
ef89c75b19 Deprecate paver arguments with '_' in them in favor of versions with '-' 2016-06-27 15:21:28 -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
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
wajeeha-khalid
d4b5b07662 MA-2531: fix unread_comment_count for 'read' patch 2016-06-24 12:38:25 +05: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
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
George Schneeloch
f8da2f1e37 Edited docstring to have URL match urls.py 2016-06-23 16:01:49 -04:00
E. Kolpakov
2b8c02a759 Discussion coffee files to JS 2016-06-23 11:05:36 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 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
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
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
Matt Drayer
a9cfa74650 Merge pull request #12775 from edx/asadiqbal08/WL-515 
WL-515 Update Activate Account message page
 2016-06-20 10:20:19 -04:00
asadiqbal
4e38b2e4e8 WL-515 Update Activate Account message page 2016-06-20 14:34:17 +05:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
David Ormsbee
5f1595910d Merge pull request #12784 from edx/release 
Release to Master (2016-06-16 hotfix)
 2016-06-16 18:50:18 -04:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
David Ormsbee
255267d42c Create forums config model for adjusting connection timeouts. 2016-06-16 13:50:13 -04:00
Waheed Ahmed
07ab6cc744 Changed refund log level to warning. 
ECOM-2378
 2016-06-16 02:59:37 +05:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Calen Pennington
a2bf90f64f Merge pull request #12763 from cpennington/badge-testing-allow-missing-dir 
Don't try and cleanup a directory that doesn't exist (in badging tests)
 2016-06-15 15:57:44 -04:00
Calen Pennington
5e11f86ed7 Remove flaky-test marker from badges tests 2016-06-15 13:49:52 -04:00
Brian Jacobel
b6cf9d231f Disallow reporting and upvoting of your own posts in discussion forums 2016-06-15 12:01:23 -04:00
Ahsan Ulhaq
09cdc6f47f Merge pull request #12760 from edx/ahsan/ECOM-4217-certs-invalidate-by-instructor 
Revert "Revert Adding logic to check if cert is invalidate then user cannot see the cert"
 2016-06-15 19:48:18 +05:00
Awais
0bd1f4ccdd Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-15 19:02:06 +05:00
Calen Pennington
4840f8c568 Don't try and cleanup a directory that doesn't exist (in badging tests) 2016-06-15 09:51:43 -04:00
Tasawer
9281c601c0 test marked as flaky 2016-06-15 16:34:48 +05:00
Ahsan Ulhaq
39f8757f42 Fix order history page if order don't have any product 2016-06-14 22:34:36 +05:00
Ben Patterson
707b682fe0 Revert "Adding logic to check if cert is invalidate then user cannot see the …" 2016-06-14 12:03:17 -04:00
Awais Qureshi
a361d44bfd Merge pull request #12666 from edx/awais786/ECOM-4217-certs-invalidate-by-instructor 
Adding logic to check if cert is invalidate then user cannot see the …
 2016-06-14 13:50:17 +05:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00