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

11117 Commits

Author SHA1 Message Date
Braden MacDonald
d4e8242477 Friendly error message when library key is invalid 2015-01-12 13:37:56 +03:00
E. Kolpakov
d25673ec72 LibraryContent bok choy acceptance tests 2015-01-12 13:37:56 +03:00
Braden MacDonald
e1f6ca93ec Unit and integration tests of content libraries 2015-01-12 13:37:56 +03:00
Braden MacDonald
eddf44d853 Library Content XModule 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
074e4cfa22 Addressed further review notes for Library Pagination 2015-01-12 13:37:56 +03:00
Jonathan Piacenti
80c517ecd1 Addressed notes from reviewers on Library Pagination. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
ed3b972078 Added tests for Library pagination. 2015-01-12 13:37:55 +03:00
E. Kolpakov
ff1a08cbd5 Paging for LibraryView added with JS tests. 2015-01-12 13:37:55 +03:00
Jonathan Piacenti
058176144e Removed the ability to add Discussion and advanced components to Content Libraries. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046) 
SOL-1, SOL-2, SOL-3
 2015-01-12 13:37:50 +03:00
arbisoft
50961fe5ad ECOM-528 code refactoring 2015-01-10 05:08:24 +05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes 
Fix cosmetic issues with the split payment and verification flow
 2015-01-09 17:42:48 -05:00
Dennis Jen
47f3252215 Merge pull request #6529 from edx/release 
Merge release back into master
 2015-01-09 17:22:15 -05:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting 
Add debug logging to video tests
 2015-01-09 16:21:07 -05:00
Jesse Zoldak
586d798069 Fix flakiness on annotation selenium test 2015-01-09 13:53:00 -05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow 
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
 2015-01-09 13:13:00 -05:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome 
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
 2015-01-09 12:50:14 -05:00
David Ormsbee
5abf2e78e8 Merge pull request #6528 from edx/ormsbee/coursemodes_admin 
Add search, sort, and slug dropdown to Course Modes admin.
 2015-01-09 12:44:30 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
76660e3ace Merge pull request #6484 from edx/sarina/move-branded-lms-assets 
Remove edX branding from default Open edX LMS [OPEN-307]
 2015-01-09 11:59:39 -05:00
David Ormsbee
18495e97a0 Add search, sort, and slug dropdown to Course Modes admin. 2015-01-09 11:43:22 -05:00
Don Mitchell
a969755661 Handle children pointers to non-existent children in has_changes 
TNL-1141
 2015-01-09 11:34:46 -05:00
David Baumgold
72133b777b Merge pull request #6523 from edx/static-templates-i18n 
Improve i18n for static_templates
 2015-01-09 11:06:50 -05:00
David Baumgold
d25a28375e Remove i18n 
Since this is a test file
 2015-01-09 11:04:08 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
arbisoft
4dfabe9eb0 ECOM-528 removed the commented code in test cases 2015-01-09 20:10:19 +05:00
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212 
MA-212 Mobile API support for backward compatibility of course updates.
 2015-01-09 10:05:59 -05:00
David Baumgold
b297b839da Improve i18n for static_templates 2015-01-09 09:42:34 -05:00
Jesse Zoldak
e77acdf401 Add debug logging to video tests 2015-01-09 09:39:02 -05:00
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