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

7224 Commits

Author SHA1 Message Date
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486 
AC-486 updating tabbed_view to use proper accessibility rules
 2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924 
moving milestones/gating check to access.py
 2016-07-11 16:21:53 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521 
AC-521 fixes 'data-table' ignores
 2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks 
Move disabling of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:17 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
Joyce Zhu
afa9a2cd3a Revert "Remove receipt page links' bottom borders" 
This reverts commit 01e2104979.
 2016-07-07 11:17:01 -04:00
Joyce Zhu
01e2104979 Remove receipt page links' bottom borders 2016-07-07 09:42:10 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
cahrens
8980d1ab2d Switch disabling of XBlocks to XBlockConfiguration. 
Also allows dynamic updates.
TNL-4668
 2016-07-06 11:04:53 -04:00
Toby Lawrence
bc990d5d75 Merge pull request #12911 from edx/PERF-344 
[PERF-344] Add versioning of cached course assets to allow graceful cache invalidation
 2016-07-05 19:34:27 -04:00
Toby Lawrence
4e22affb24 [PERF-344] Add versioning of cached course assets to allow graceful cache invalidation 
When releasing the versioned assets work, we stumbled on a problem with old pickled
versions of the StaticContent objects residing in cache, which triggered a bug in the
code. Not wanting to blow away all cached items, we ended up having to revert and add
in some backwards-compatible helper code to ease the transition.

With this, we'll now utilize the version argument that Django's caching interface
allows, in conjunction with a constant value that can be modified when breaking changes
are being made, to let us gracefully ignore older cached course assets.
 2016-07-05 15:15:47 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Omar Khan
2faab97eea Add OpenStack Swift support 
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
 2016-07-05 17:31:59 +03:00
Saleem Latif
b89bb7e6b3 Merge pull request #12933 from edx/saleem-latif/fix-footer-test-failure 
Fix footer test failures
 2016-07-03 01:12:38 +05:00
Saleem Latif
5ccc80b42f Fix footer test failures 2016-07-03 00:11:45 +05:00
Renzo Lucioni
d738188550 Add upgrade section to program detail course cards. 
Displays a message and link when a user is enrolled in a program's course run but must upgrade in order to be eligible for the program certificate. ECOM-4220.
 2016-07-02 01:23:20 -04:00
Nimisha Asthagiri
69410948c9 Reduce number of transformer traversals (#12881) 
This change improves grading performance by combining what had previously been
multiple course tree traversals into a single traversal with combined
filtering logic.
 2016-07-01 12:28:33 -04:00
tasawernawaz
860dabe4f6 show messge on progress page when user is in audit mode. ECOM-4797 2016-06-30 20:13:51 +05:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
wajeeha-khalid
115c2ced4f Merge pull request #12798 from edx/jia/MA-2531 
MA-2531: fix unread_comment_count for 'read' patch
 2016-06-29 11:01:57 +05:00
Calen Pennington
b31d1cb8ab Merge pull request #12831 from cpennington/xunit-only-in-ci 
Clean up paver arguments
 2016-06-28 16:26:47 -04:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Eric Fischer
f22d673980 Remove MaxScoresCache (#12878) 
Performance improvement, this cache is no longer needed thanks
to block_structure caching data.

TNL-4874
 2016-06-28 14:04:00 -04:00
Kevin Kim
d0be769f1d Merge pull request #12667 from edx/kkim/tz_pref_AS 
Time Zone in Account Settings
 2016-06-28 13:10:10 -04:00
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