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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Lee
13dbfb8679 Merge pull request #8589 from edx/gprice/discussion-api-abuse-flagged 
Add abuse flagging to discussion API
 2015-06-23 18:08:58 -04:00
Greg Price
52a3306e2a Add abuse flagging to discussion API 
Flagging/unflagging is done by issuing a PATCH request on a thread or
comment endpoint with the "abuse_flagged" field set.
 2015-06-23 17:22:54 -04:00
Christine Lytwynec
9d42971440 Merge pull request #8646 from edx/clytwynec/fix-TestEmailMessageWithCustomICRVBlock 
don't use hardcoded date in verification email test
 2015-06-23 17:01:51 -04:00
Will Daly
545f521933 Merge pull request #8652 from edx/will/logged-in-cookie-cleanup 
Remove duplicate logged-in-cookie helper methods
 2015-06-23 13:53:37 -07:00
cahrens
ead3cefa5f Remove unused setting. 2015-06-23 16:36:25 -04:00
cahrens
51a72c63fa Delete files that have no references to them. 2015-06-23 16:12:36 -04:00
Christopher Lee
9d6d922e68 Merge pull request #8544 from edx/gprice/discussion-api-thread-list-following 
Add followed thread retrieval to discussion API
 2015-06-23 16:08:51 -04:00
Will Daly
b89ad57cb7 Remove duplicate logged-in-cookie helper methods 
There were two helper methods that set the marketing site
"logged in" cookie.  This commit deletes one of them
and ensures that all callers are using the other one.
 2015-06-23 12:47:15 -07:00
Christine Lytwynec
e947a92909 Merge pull request #8622 from edx/clytwynec/quiet_sass_compile_warnings 
pass debug option through to compile_sass
 2015-06-23 15:46:05 -04:00
Feanil Patel
9480a3652c Merge pull request #8632 from edx/hotfix/2015-06-22 
Hotfix/2015 06 22
 2015-06-23 15:38:50 -04:00
Christine Lytwynec
16745cdec3 pass debug option through to compile_sass 2015-06-23 14:39:06 -04:00
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -04:00
Tyler Nickerson
da16f4441e Merge pull request #8592 from edx/nickersoft/improved-embargo-restriction 
XCOM-416: Improved basket API's handling of embargo restrictions
 2015-06-23 14:18:13 -04:00
Nickersoft
e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration 2015-06-23 14:17:43 -04:00
Greg Price
54756317f1 Add followed thread retrieval to discussion API 
This implements the "following" value for the "view" query parameter on
the thread list endpoint.
 2015-06-23 13:38:34 -04:00
Calen Pennington
de142b2b51 Set a minimum number of Xblock constructions in field override tests 2015-06-23 13:32:50 -04:00
Jesse Zoldak
9a94c60147 Merge pull request #8644 from edx/zoldak/TE-950 
Update bok-choy version
 2015-06-23 12:57:56 -04:00
Diana Huang
ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup 
Switch tabs to use ugettext_noop for titles.
 2015-06-23 12:33:06 -04:00
frances botsford
bfd250ed61 Merge pull request #8596 from edx/frances/fix/course-content-margin 
adjust margin-bottom on courseware with license
 2015-06-23 11:53:15 -04:00
Will Daly
9efe3201da Merge pull request #8568 from edx/will/credit-provider-api-timestamp-update 
Update the format of the credit provider timestamp.
 2015-06-23 08:46:30 -07:00
Jesse Zoldak
79527f8191 Update bok-choy version 2015-06-23 11:22:12 -04:00
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
Awais
243ac00481 ECOM-1772 Due date issue test case fixed. 2015-06-22 23:29:54 -04:00
David Ormsbee
8718dc13ca Cache SplitMongo course structures in memcached. 
This is primarily to reduce load on MongoDB, where we've lately
had performance problems that we suspect are caused by very
large course structures being evicted from MongoDB's cache. This
may potentially give us a path to better performance as well,
but that's not the goal of this commit.

Surprisingly, LZ4 seemed to actually run more slowly than zlib
for this. Possibly because of some overhead in the Python
bindings? GZip was also surprisingly slow given that it uses
zlib underneath (something like 5x slower).

Use separate cache backend for caching structures.

Abstract out course structure cache.

add datadog metrics for compressed course structure sizes

Since we're using a different cache background, we don't need to have a cache prefix

Use dummy cache backend for tests.

Fallback to default cache if course_structure_cache doesn't exist.
 2015-06-22 23:21:19 -04:00
Kyle McCormick
13f5fe029f Merge pull request #8484 from edx/mekkz/course-overviews 
Introduce caching of course metadata with app course_overviews
 2015-06-22 21:38:00 -04:00
Kyle McCormick
d84c3bd7a9 MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews 2015-06-22 18:33:12 -04:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Kyle McCormick
328ed9270f Add new testing decorator check_mongo_calls_range 2015-06-22 17:38:53 -04:00
Will Daly
3dafdd2fc5 Merge pull request #8625 from edx/will/js-test-fixup 
Fix JS tests that broke due to a conflict between merges
 2015-06-22 14:37:20 -07:00
Renzo Lucioni
ba24c0297e Merge pull request #8626 from edx/renzo/fix-test-case 
Correct logistration GET parameter preservation test case
 2015-06-22 17:23:35 -04:00
Renzo Lucioni
f78d45080d Correct logistration GET parameter preservation test case 2015-06-22 16:25:52 -04:00
Will Daly
356cdeecb4 Fix JS tests that broke due to a conflict between merges 2015-06-22 13:22:17 -07:00
Sarina Canelake
e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402 
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
 2015-06-22 16:05:49 -04:00
Matt Drayer
39d2be7244 Merge pull request #8619 from edx/mattdrayer/ECOM-1773 
mattdrayer/ECOM-1773: Fixed invalid URL reversal
 2015-06-22 15:35:13 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" 
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
 2015-06-22 13:55:53 -04:00
Nimisha Asthagiri
d9cdb5d691 Merge pull request #8615 from edx/nimisha/fix-unit-test 
ECOM-1772 Due date issue test case fixed.
 2015-06-22 13:50:55 -04:00
Andy Armstrong
9175a0c465 Merge pull request #8614 from edx/andya/fix-content-libraries 
Use RequireJS Optimizer for content libraries
 2015-06-22 13:47:05 -04:00
Sarina Canelake
19fdaeced3 Merge pull request #8612 from edx/sarina/remove_hinting_templates 
Remove hinting templates as 'tab:' definition fails on Split
 2015-06-22 13:37:43 -04:00
Christopher Lee
44e13af6be Merge pull request #8576 from edx/gprice/discussion-api-max-depth 
Enforce MAX_COMMENT_DEPTH in discussion_api
 2015-06-22 13:30:37 -04:00
Ned Batchelder
5174344a2e Merge pull request #8611 from edx/ned/fix-rednose 
Upgrade rednose to latest to fix bad output.
 2015-06-22 13:17:56 -04:00
chrisndodge
0f3f98f35d Merge pull request #8586 from edx/cdodge/fix-multi-seat_spinner 
fix problems with multi-seat purchases when accessibility review was …
 2015-06-22 13:16:34 -04:00
Will Daly
c426f5506b Respond to code review feedback. 2015-06-22 10:11:28 -07:00
Awais
1b0246e2af ECOM-1772 Due date issue test case fixed. 2015-06-22 13:04:21 -04:00
Will Daly
cea06e1217 Update the format of the credit provider timestamp. 
Use the number of seconds since the epoch (Jan 1 1970 UTC)
instead of an ISO-formatted datetime string.  This is easier
for credit providers to parse.
 2015-06-22 10:03:31 -07:00
Will Daly
5fa75989fd Merge pull request #8507 from edx/will/reverification-ios 
Reverification iOS support and refactor
 2015-06-22 09:54:49 -07:00
Xavier Antoviaque
fe0b999899 Merge pull request #8613 from edx/xblock-utils-hash 
Updates the XBlock utils requirement to the latest
 2015-06-22 18:07:17 +02:00
Waheed Ahmed
678369ca7f Merge pull request #8428 from edx/waheed/tnl2166-fix-two-play-events-on-replay 
Fixed two paly_video events emitted on video replay.
 2015-06-22 21:00:40 +05:00
Will Daly
8c52c92bcb Reverification iOS support and refactor 
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
 2015-06-22 08:45:12 -07:00