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

10072 Commits

Author SHA1 Message Date
stephensanchez
1e7d567b58 Initial framework for the Course About API. 
ECOM-248 Course Info API. Basic functionality implemented.

ECOM-248 adding factory for about descriptor and test cases for course info api

ECOM-248 adding test cases for couse info api.

ECOM-248 re-factoring code. updating test cases.

Tests for course_about data module

ECOM-248 Adding test cases for the exceptions.

ECOM-248 re-factoring code. fixing quality issues.

ECOM-248 fixing test cases and moved parse video method into utils.

added github username in authors

ECOM-248 removed merging issue of test_data

ECOM-248 removed unused files
 2015-01-07 20:03:54 +05:00
Waqas Khalid
ed812f1ca8 Merge pull request #6476 from mlkwaqas/waqas/fix-discussion-flaky-test 
Test pagination reposition test is failing
 2015-01-07 19:53:42 +05:00
Waqas Khalid
e39be585ab Test pagination reposition test is failing 
Test pagination reposition test is failing on release
and master. It was flaky test and this problem was
caused by the javascript animation. Issue was fixed by
adding the promise that we check the value of window
top after the animation is completed.
 2015-01-07 19:02:53 +05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -05:00
Marco Morales
f91c5ffd1f Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup 
SASS compilation variable conventions update
 2015-01-06 14:47:24 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
Sarina Canelake
fdc5f2433d Merge pull request #6278 from edx/sarina/finish-pr-5863 
Fix edX name hardcoded in password reset email
 2015-01-05 12:49:28 -05:00
AlasdairSwan
0be8ab3aab Merge pull request #6406 from edx/alasdair/logistration-2.0 
ECOM-783 updated logistration in light of redesign
 2015-01-05 12:48:32 -05:00
Julien Romagnoli
a80c09a9f2 Fix edX name hardcoded in password reset email 2015-01-05 11:27:56 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
Waqas Khalid
e7be2f7311 Discussion thread response show dual vote count 
When the responses of the thread is loaded it shows
dual vote count one with simple text and one with
button whereas only text should be shown when thread
is closed and only button when thread is open.

TNL-1016
 2015-01-05 20:55:32 +05:00
John Eskew
0dbfd174e2 Merge pull request #6097 from edx/jeskew/fix_exception_on_fill_run 
When fill_in_run() fails, handle failure instead of exception.
 2015-01-05 09:03:56 -05:00
Braden MacDonald
877e231c7a Fix two tests failing on January 1, 2015 2015-01-02 12:25:26 -08:00
chrisndodge
91a4796216 Merge pull request #6196 from edx/muhhshoaib/WL-168 
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
 2015-01-01 10:00:06 -05:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864 
Hide verification messaging if the user has an active verification
 2014-12-31 11:03:34 -08:00
Will Daly
0ac14dce79 Merge pull request #6410 from edx/will/decouple-verified-ab-test 
Decouple verified/payment A/B test setup
 2014-12-31 10:39:49 -08:00
Will Daly
01814c3983 Hide verification messaging if the user has an active verification 2014-12-31 13:01:56 -05:00
Muhammad Shoaib
5a437b396e WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page 
improvements suggested by william
 2014-12-31 17:45:31 +05:00
chrisndodge
77c68b7dbd Merge pull request #6037 from edx/cdodge/microsite-aware-session-middleware 
Allow for Microsite middleware to change cookie domains
 2014-12-30 23:43:24 -05:00
John Eskew
863bdc1712 When fill_in_run() fails, handle failure instead of exception. 2014-12-30 17:07:05 -05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param 
Allow disabling of experiment
 2014-12-30 13:36:25 -08:00
Jim Abramson
2eab51ab26 Merge pull request #4786 from aboudreault/inline-discusssion-cohorting 
Add always_cohort_inline_discussions in course settings
 2014-12-30 13:11:37 -05:00
David Baumgold
4ec0295bab Improve i18n on the LMS dashboard course listing page 
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
 2014-12-30 14:24:15 +00:00
Chris Dodge
b80b347ed0 Make SessionMiddleware Microsite aware 2014-12-29 12:06:24 -05:00
Jonathan Piacenti
6e4ccfb7bd Added Jasmine tests for always_cohort_inline_discussions. 2014-12-26 18:03:51 +00:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
John Eskew
0d874def09 Merge pull request #6350 from edx/jeskew/asset_md_contract_fix 
Change contracts to allow user_id with type long().
 2014-12-23 11:11:05 -05:00
Fred Smith
cc0789a104 Merge pull request #6355 from edx/release 
Release
 2014-12-23 08:32:58 -05:00
John Eskew
1ad08cc303 Change contracts to allow user_id with type long(). Add tests. 2014-12-22 17:08:54 -05:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Will Daly
30549bd7ad Send the user to the login page if registering with a linked but inactive account 2014-12-22 13:23:29 -05:00
Don Mitchell
5ef2770391 Merge pull request #6329 from edx/dhm/bug_split_index 
Fix get_courses to handle inflight changes
 2014-12-19 17:10:42 -05:00
Don Mitchell
e1035aa844 Fix get_courses to handle inflight changes 
more rigorously.
 2014-12-19 15:27:23 -05:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup 
Hook up new payment and verification flow
 2014-12-19 13:29:13 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Nimisha Asthagiri
ad7a67da2b Update segment.io shim for mobile event syntax change. 2014-12-19 12:39:39 -05:00
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. 
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
 2014-12-19 09:00:32 -05:00
Don Mitchell
d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides 
make asides render in studio
 2014-12-18 15:41:58 -05:00
Stephen Sanchez
0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer 
Enrollment API Cleanup
 2014-12-18 11:00:23 -05:00
stephensanchez
22a18e350d Updating the design of the DRF views for enrollments. 
Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
 2014-12-18 15:39:01 +00:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio. 
TNL-920
 2014-12-18 11:42:18 +05:00
chrisndodge
f733d1d8bd Merge pull request #6234 from edx/afzaledx/WL-172-order-history 
WL-172 Show a Order History list on the Student Dashboard for any PaidCo...
 2014-12-17 20:46:54 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Don Mitchell
4360a78142 Studio render XBlockAside views 
PLAT-280
 2014-12-17 15:44:49 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides 
PLAT-221
 2014-12-17 13:51:10 -05:00
Diana Huang
cb7f725d2d Merge pull request #6282 from edx/diana/kill-courseware-bi-events 
Remove Segment events from courseware.
 2014-12-17 11:26:06 -05:00
Waqas Khalid
c7fde04433 Merge pull request #6067 from mlkwaqas/waqas/tnl107-changing-pages-not-reposition 
In user profile changing page should reposition window to top
 2014-12-17 19:58:28 +05:00
Oleg Marshev
8260bee9c3 Merge pull request #6266 from mitocw/fix_lti_callback 
OAuth signature should be verified against URL provided to the tool.
 2014-12-17 16:53:48 +02:00