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

31067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -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
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
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
Will Daly
c426f5506b Respond to code review feedback. 2015-06-22 10:11:28 -07: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
Ben Patterson
86f17d02e0 Merge pull request #8602 from edx/benp/sol-975-fix 
Fix flaky test. SOL-975
 2015-06-22 11:41:50 -04:00
Xavier Antoviaque
f04547cf0f Updates the XBlock utilsrequirement to the latest 
This integrates the fixes from https://github.com/edx/xblock-utils/pull/20 and https://github.com/edx/xblock-utils/pull/21 - cf the PRs for the code review & +1s.

CC @smarnach @sarina
 2015-06-22 17:29:21 +02:00
Waheed Ahmed
fb2f4fdade Fixed two paly_video events emitted on video replay. 
TNL-2166
 2015-06-22 19:59:36 +05: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
Ned Batchelder
8b883ba2c7 Upgrade rednose to latest to fix bad output. 2015-06-22 10:35:20 -04:00
Ahsan Ulhaq
61782ff9fa Merge pull request #7898 from edx/ahsan/AC-99-learner-profile-location-language-fields-accessibility 
Learner profile Location and Language fields Accessibility issues
 2015-06-22 18:56:36 +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 Qureshi
473c688655 Merge pull request #8605 from edx/awais786/ECOM-1772-testcase-with-due-date-issue 
ECOM-1772 Due date issue test case fixed.
 2015-06-22 17:58:11 +05:00
Awais
d5b7d285d6 ECOM-1772 Due date issue test case fixed. 2015-06-22 14:55:12 +05:00
Ben Patterson
2ee4b85ffc Fix flaky test. SOL-975 
Remove flaky flag, improve linting.
 2015-06-20 07:30:14 -04: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
John Eskew
c59a3db730 Merge pull request #8537 from edx/jeskew/import_slowdown 
Re-nest for the signal-sending, then un-nest.
 2015-06-19 14:54:23 -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
Nimisha Asthagiri
84753740e3 Merge pull request #8570 from edx/mobile/video-upload-MA-844 
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
 2015-06-19 11:21:50 -04:00