Commit Graph

3272 Commits

Author SHA1 Message Date
Sanford Student
d996c2a3cd per cliff's review 2016-07-26 11:39:19 -04:00
Sanford Student
d9e0ba45cc first round of self review and code review 2016-07-26 10:50:02 -04:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
sanfordstudent
ba54ad197e Merge pull request #13075 from edx/sstudent/TNL-4925
generalizing proctored exam transformer to handle all milestones
2016-07-25 10:10:42 -04:00
wajeeha-khalid
03cee389e0 update oauthlib version to 1.0.3 2016-07-25 10:59:42 +05:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance
Maintenance app and force publish course view
2016-07-23 01:23:58 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Sanford Student
87a9ebce9a generalizing proctored exam transformer to handle all milestones 2016-07-22 12:57:23 -04:00
Nimisha Asthagiri
b04a6a6a4b Merge pull request #13053 from edx/tnl/grades-app
Create Grades djangoapp
2016-07-22 09:07:40 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp
https://openedx.atlassian.net/browse/TNL-5008
2016-07-22 00:09:43 -04:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels
Studio support level of components/xblocks
2016-07-21 17:13:58 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation.
TNL-4670
2016-07-21 15:44:59 -04:00
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061)
This reverts commit 5db58c0038.
2016-07-21 13:58:35 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date
Convert ORA Due Dates
2016-07-21 10:52:07 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release
Release 2016-07-20 back to Master
2016-07-21 10:43:58 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main
Convert cms/coffee/src/main to js
2016-07-20 15:16:48 -04:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through
make password validation code more DRY

grammar nit: "less" -> "fewer"
2016-07-20 11:06:58 -04:00
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords
use random rather than unusable so they can be reset
2016-07-20 09:28:26 -04:00
Felipe Montoya
c32b30ba94 Relocating inside the cms namespace
Addressing feedback
2016-07-18 18:07:35 -05:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls
Use course run marketing URLs from the catalog service on program detail page
2016-07-15 17:55:01 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page
Part of ECOM-4566.
2016-07-15 16:12:10 -04:00
e0d
8a18b2c351 use random rather than unusable so they can be reset 2016-07-14 08:09:51 -04:00
Awais Jibran
07467a5b68 Merge pull request #12989 from edx/aj/add-logging-for-allow-donation
Adding logging if course_id is not found in enrolled course modes.
2016-07-14 15:03:08 +05:00
Awais Jibran
dba8a51f59 Adding logging if course_id is not found in enrolled course modes. 2016-07-14 12:59:38 +05:00
Toby Lawrence
8ab62b5b99 [PERF-351] Account for settings.STATIC_URL in XBlock resource URLs when
rewriting them.

In PERF-341, we adjusted the static_replace middleware to try and
exclude static XBlock resource URLs from being interpreted as the marker
URLs used to signify course assets in course content.  Since they both
started with /static, this could, and did, cause issues where linking
directly to the assets of an XBlock within, say, one of its templates,
would lead to that link being rewritten and ultimately being incorrect.
The fix attempted to see if the link started with the prefix that all
static XBlock resource URLs start, and if so, it returned them
unmodified.

We incorrectly assumed that our testing captured all cases, and since
we're here, we know that this was wrong.  We weren't accounting for cases
when the URLs being generated had the STATIC_URL configuration value
prefixed -- https://example.com/static/xblock/.... -- and so our direct
check of seeing if such a URL started with "/static/xblock" would always
fail, leading to the erroneous rewriting and nonsensical output.

This fix checks if the link either starts with the prefix OR if it
starts with the STATIC_URL value and contains the prefix overall.  There
is a small overlap between the STATIC_URL and the prefix we check for,
so an inconsistency could arise down the line if we changed our
STATIC_URL to use a difference base directory, but our tests will at
least catch the issue now.
2016-07-12 22:33: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
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Toby Lawrence
54fa8aebbc Merge pull request #12959 from edx/PERF-346
[PERF-346] Add a second version component to versioned course asset URLs
2016-07-11 09:32:09 -04:00
Toby Lawrence
f15533dc8f [PERF-346] Add a second version component to versioned course asset URLs
This version component reflects the "version" of the StaticContent
objects which we cache server-side.  If the layout of those objects
changes between releases, errors occur when loading them from cache.

By using a separate version value, which can be incremented on its own
after a change has been made to the StaticContent class, we can avoid
loading older cached content and in turn take advantage of these changes
faster, without needing to intervene operationally.
2016-07-10 19:20:20 -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
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
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
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
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
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
Awais Jibran
4267666711 Fix bulk_change_enrollment command to emit event
ECOM-4775
2016-06-27 11:43:01 +05:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Felipe Montoya
27d4e4bdc2 Compiling cms/coffee/src/main into a js file and fixing the references
Linting
2016-06-23 16:43:18 -05:00
Toby Lawrence
959c97d74a Merge pull request #12821 from edx/PERF-341
[PERF-341] Don't rewrite XBlock resource URLs.
2016-06-23 15:33:07 -04:00