Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

11688 Commits

Author SHA1 Message Date
arbisoft
36626a2b8b ECOM-528 added test cases 2015-01-09 17:55:22 +05:00
Waqas Khalid
82eed83f64 In inline discussion two discussion module override actions 
In inline discussion if we have two discussion module the
new post button open form for both discussions as well as
cancel button of one discussion call the cancel of other.
Click and button actions are now being handled inside view
of each module so that they don't disturb eachother.

TNL-776
 2015-01-09 17:10:10 +05:00
Waheed Ahmed
18f3221dcf Enforced '000' prefix for xmodule.js and added unit test. 
TNL-1070
 2015-01-09 16:30:42 +05:00
arbisoft
fd76f3754c ECOM-528 added test cases 2015-01-09 16:29:35 +05:00
arbisoft
7eb8195c23 ECOM-528 added donation support for verified courses 2015-01-09 12:31:33 +05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
arbisoft
7bdbf8f17c ECOM-528 added donation support for verified courses 2015-01-09 00:02:04 +05:00
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00
David Baumgold
96d86e4e17 Placeholder image for Open edX Studio logo, when not running on edx.org 2015-01-08 12:42:26 -05:00
Nimisha Asthagiri
3498eeb1f6 MA-212 Mobile API support for backward compatibility of course updates. 2015-01-08 10:05:29 -05:00
arbisoft
99659ce3d4 ECOM-528 added donation support for verified courses 2015-01-08 14:52:31 +05:00
muhammad-ammar
5ba492ecf3 Get students experiments, groups, and cohorts 
TNL-498
 2015-01-08 14:29:53 +05:00
Shrhawk
58fd7a92c3 Merge pull request #6193 from Shrhawk/shr/bug/TNL-952-customresponse-sorting_issue 
Fix sorting issue
 2015-01-08 12:46:41 +05:00
Waqas Khalid
1b7d5f347d 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 11:23:59 -05:00
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
Syed Hassan Raza
ee39957101 Fix sorting issue 
TNL-952
 2015-01-07 17:15:40 +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
Adam Palay
7837607ca9 only recusively delete modules if all their parents are marked for deletion (PLAT-333) 
update '_delete_item' method for draft only modules and update delete_orphans management command

fix test_courseware which fails due to invalid future date
 2015-01-05 14:54:17 -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