Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,074 Commits 1 Branch 0 Tags
545f5219337338acab1620610df30c3fe7700a31
Commit Graph

11448 Commits

Author SHA1 Message Date
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
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
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
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -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
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
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
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
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
Ahsan Ulhaq
698f6fb2d3 Merge pull request #8550 from edx/ahsan/ECOM-1523-Credit-Eligibility-Progress-page-display-updated 
Credit eligibility requirements display on student progress page
 2015-06-22 19:54:38 +05:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page 
ECOM-1523
 2015-06-22 18:36:54 +05:00
Ahsan Ulhaq
0a696ae87f Learner profile Location and Language fields Accessibility issues 
Following are done in this PR
1-The controls to edit the form fields were hyperlinks, added button and required css to
  make it look like hyperlink.
2-label added when swap to combobox
3-Non breaking spaces added with dashes.
 2015-06-22 18:10:39 +05:00
Awais
d5b7d285d6 ECOM-1772 Due date issue test case fixed. 2015-06-22 14:55:12 +05:00
Utkarsh
f93f4600dd Merge pull request #8280 from edx/utkjad/callstackmanager 
Adding call stack manager Version-I
 2015-06-19 18:02:48 -04:00
Clinton Blackburn
72ca88c44e Merge pull request #8578 from edx/clintonb/checkout-button-update 
Updated Payment Buttons
 2015-06-19 17:25:44 -04:00
utkjad
59e0d22fc3 Adding call stack manager 2015-06-19 20:43:26 +00:00
Frances Botsford
3a03a0e940 adjust margin-bottom on courseware with license 2015-06-19 16:31:25 -04:00
Diana Huang
5fb2a1fd8e Merge pull request #8583 from edx/diana/course-tab-cleanup 
Make course tab refreshing safer.
 2015-06-19 15:38:30 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Nimisha Asthagiri
e72eaf81ac Merge pull request #8582 from edx/cdodge/fix-none-totals 
fix price per seat
 2015-06-19 13:57:15 -04:00
Clinton Blackburn
1281532be5 Updated Payment Buttons 
The payment buttons now match the style of the verified upgrade buttons.

XCOM-422
 2015-06-19 13:39:16 -04:00
Greg Price
a77923dc12 Merge pull request #8564 from edx/gprice/discussion-api-whitespace-content 
Handle whitespace-only content in discussion API
 2015-06-19 13:04:47 -04:00
Greg Price
6cd8889f9f Merge pull request #8562 from edx/gprice/discussion-api-editable-fields 
Add editable_fields to discussion API responses
 2015-06-19 12:57:31 -04:00
Greg Price
7fcf4e3d8d fixup! Enforce MAX_COMMENT_DEPTH in discussion_api 
Add more extensive testing
 2015-06-19 12:48:11 -04:00
Greg Price
6a9b435955 Merge pull request #8563 from edx/gprice/discussion-api-missing-pinned 
Fix discussion_api to handle old threads
 2015-06-19 12:03:07 -04:00
Greg Price
16d7a81b96 Add editable_fields to discussion API responses 
This will allow clients to determine what actions (e.g. following,
endorsing, and editing content) a user can take on a piece of content.
 2015-06-19 12:02:21 -04:00
Greg Price
174b4d943a Handle whitespace-only content in discussion API 
The comments service rejects whitespace-only content for certain
strings, so the discussion API should also reject such content.
 2015-06-19 12:01:34 -04:00
Chris Dodge
61aa3505a3 fix price per seat 2015-06-19 10:27:53 -04:00
AlasdairSwan
36c8c36987 Merge pull request #8567 from edx/alasdair/ECOM-1673-dashboard-challenge-expanded 
ECOM-1673 removed class and icon to always show full upsell content.
 2015-06-19 09:31:22 -04:00
Renzo Lucioni
e960adc0ff Merge pull request #8262 from open-craft/tpa-pipeline-consolidation 
Cleanup of third-party login and auto-enrollment
 2015-06-19 09:12:11 -04:00
AlasdairSwan
b30839fe88 ECOM-1673 removed class and icon to always show full upsell content. 
removed JavaScript function specific to the upsell toggle
removed bok choy test
Removed all referenced to toggleExpandMessage()
 2015-06-19 08:29:51 -04:00
chrisndodge
9797951346 Merge pull request #8572 from edx/cdodge/fix-none-totals 
Treat aggregate sums of None as 0
 2015-06-19 07:24:21 -04:00
Braden MacDonald
345fcabd05 Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code 2015-06-18 20:57:19 -07:00
Braden MacDonald
350f98ebde Changes for compatibility with latest python-social-auth (0.2.7) 2015-06-18 19:31:47 -07:00
Sarina Canelake
6d121dc5ad Merge pull request #6786 from Stanford-Online/nick/extended-hint 
Extended hint features
 2015-06-18 18:34:24 -04:00
Greg Price
f47ab2bb18 Enforce MAX_COMMENT_DEPTH in discussion_api 2015-06-18 17:18:02 -04:00
Chris Dodge
0613c2dde2 Treat aggregate sums of None as 0 2015-06-18 15:15:21 -04:00
Will Daly
7cb41c7783 Merge pull request #8553 from edx/will/ecom-467 
Add professional enrollments to the instructor dashboard.
 2015-06-18 11:27:26 -04:00
Greg Price
6505713302 Fix discussion_api to handle old threads 
Some old threads do not have the pinned field set, which the thread
serializer should handle.
 2015-06-18 11:25:22 -04:00
Ben McMorran
d544db6525 Merge pull request #8513 from edx/benmcmorran/topic-card 
TNL-1893 Add teams topic card
 2015-06-18 10:03:37 -04:00
Ben McMorran
390e2c1865 Merge pull request #8528 from edx/benmcmorran/discussion-caching 
TNL-2291 Discussion forums permission caching
 2015-06-18 09:22:09 -04:00
Ben McMorran
c02d09a185 TNL-1893 Teams Topic Card 2015-06-18 13:16:28 +00:00
dino-cikatic
89f13e15bb Merge pull request #8548 from edx/dcikatic/SOL-994 
SOL-994 fix js loading if search features disabled
 2015-06-18 09:22:13 +02:00
Greg Price
7c53400134 Merge pull request #8541 from edx/gprice/discussion-api-rendered-body 
Add rendered_body to discussion API endpoints
 2015-06-17 22:51:38 -04:00
Greg Price
c28b295806 Add rendered_body to discussion API endpoints 
The rendering in this commit does not prevent MathJax content from being
rendered as the discussion JavaScript code does.
 2015-06-17 20:23:30 -04:00
Greg Price
82b117f66e Merge pull request #8543 from edx/gprice/discussion-api-comment-vote 
Add comment voting to discussion API
 2015-06-17 19:41:08 -04:00