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

13534 Commits

Author SHA1 Message Date
Albert St. Aubin
4df50e9008 Updated to check and ensure the progress Detail is a string before looking for the index of / 
TNL-4723

Added basic JS test to check for progress with integer detail

Added another test with a non-string value to force the failure state with data returns a non-string value

Removed test with unrealistic int input for progress_detail

Cleaned up duplicate code in renderProgress tests
 2016-07-08 11:44:09 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05: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
Adam
f7c45cf47d Merge pull request #12952 from edx/adam/quiet-logs 
quiet some noisy logs
 2016-07-07 11:02:21 -04:00
Chris
e4db0e39d0 Merge pull request #12915 from edx/clrux/ac-520 
AC-520 fixes `section` ignores
 2016-07-07 03:20:14 -07:00
Adam Palay
a19d2e76ff quiet some noisy logs 2016-07-06 16:32:27 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00
Chris Rodriguez
5b31e4d67f AC-518 - button-name - test_lms_instructor_dashboard.py 2016-07-06 10:32:00 -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
Diana Huang
6e538e1304 Fix issues with truncation. 2016-07-05 10:39:37 -04: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
Ben Patterson
27499d1456 Merge pull request #12892 from eduNEXT/jfavellar90/TE-1194-1 
Replacing relative imports by absolute imports for all files into com…
 2016-07-05 08:38:57 -04:00
Chris
a561029463 Merge pull request #12904 from edx/clrux/ac-519 
AC-519 removing list from ignored a11y check
 2016-07-01 06:34:12 -04:00
hamzamunir7300
930e0375a5 Merge pull request #12898 from edx/hamzamunir/TNL-4141-problem_creation_empty_answer_not_allowed 
Hamzamunir/tnl 4141 problem creation empty answer not allowed
 2016-06-30 19:53:20 +05:00
Chris Rodriguez
b0ede3f6f5 AC-519 - list - test_lms_instructor_dashboard.py 2016-06-30 08:01:38 -04: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
Hamza Munir
3ad2f09233 tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation. 2016-06-30 14:34:31 +05:00
Diana Huang
f4cf618154 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-06-29 19:51:14 -04:00
Diana Huang
48726b71de Make safe-linter happy. 2016-06-29 17:13:07 -04:00
alisan617
68587ade39 remove icon-fallback-img spans and safe commit templating 2016-06-29 15:12:33 -04:00
Brian Jacobel
3cca6046fa Revert "Change topic name truncation." 
This reverts commit d75e633508.
 2016-06-29 15:06:49 -04:00
Brian Jacobel
628ec509cc Merge pull request #12859 from edx/bjacobel/TNL-4392 
Fix TNL-4392
 2016-06-29 10:16:42 -04: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
Jhony Avella
7c0a04b631 Replacing relative imports by absolute imports for all files into common/test/acceptance/performance directory 2016-06-28 15:53:01 -05:00
Jeremy Bowman
2b7866bfc1 Merge pull request #12886 from edx/release-2016-06-28-conflict 
Merge release into master
 2016-06-28 16:19:50 -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
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
Jeremy Bowman
225768ac2d Merge remote-tracking branch 'origin/release' into release-2016-06-28-conflict 2016-06-28 13:04:26 -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
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
fcfacf22c8 Revert "TNL 4141" 2016-06-28 07:19:25 -04:00
Chris Rodriguez
0d7bf1b78e Removing safe transcripts for now 2016-06-28 06:05:40 -04:00
Chris Rodriguez
fba37a129d AC-454 adding visual clarify for selected menu options 2016-06-28 06:05:40 -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
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
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
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Tasawer
3a984d3ca2 Make user enrollment more robust 
ECOM-1730
 2016-06-27 14:51:09 +00: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
Brian Jacobel
24b22a8e84 Fix TNL-4392 2016-06-24 15:08:45 -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
1798b1f1bc Merge pull request #12567 from edx/tnl/grading 
Grading uses Block Transformers
 2016-06-24 09:01:30 -04:00
Nimisha Asthagiri
7fe002ff82 Improve error handling in Split Modulestore 2016-06-24 00:46:01 -04:00
Nimisha Asthagiri
8513e823bc Add block_metadata_utils 2016-06-23 20:22:33 -04:00