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

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
e95f2aeeed Remove LinkedIn integration 2015-01-07 14:38:48 -05:00
David Baumgold
0ec4855909 clean up reject_name_change email template a bit 2015-01-07 13:38:38 -05:00
David Baumgold
a750e43828 Use {platform_name} in discussions header 2015-01-07 13:32:28 -05:00
Will Daly
47f02ec4d2 Merge pull request #6483 from edx/hotfix/ecom-876 
Fix for ECOM-876
 2015-01-07 13:07:39 -05:00
Ned Batchelder
897c96dda7 Merge pull request #6482 from edx/ned/enable-schoolyourself 
Need to add new XBlocks to the ADVANCED_COMPONENTS list
 2015-01-07 12:11:15 -05:00
Will Daly
bea5a3ce64 Fix for ECOM-876 2015-01-07 12:06:36 -05:00
David Baumgold
82d02851a7 Merge pull request #6468 from edx/studio-name-by-default 
Use "Studio" name by default (instead of "edX Studio")
 2015-01-07 12:04:49 -05:00
Ned Batchelder
36e879a4f0 Need to add new XBlocks to the ADVANCED_COMPONENTS list 2015-01-07 11:42:46 -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
Aamir
13332b6d40 Merge pull request #6474 from edx/awais786/course_info_api 
Awais786/course info api
 2015-01-07 21:04:46 +05:00
chrisndodge
dd2d191285 Merge pull request #6472 from edx/cdodge/fix-pylint-error-in-rc 
remove unused variable
 2015-01-07 10:10:28 -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
David Baumgold
2077d4dc6d Merge pull request #6439 from edx/improve-shoppingcart-tests 
Change tests so they show failures better.
 2015-01-07 09:12:24 -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
Sarina Canelake
8af54943e1 Merge pull request #6243 from edx/sarina/default-edx-UI 
Clean up front page UI and video elements, remove cruft [OPEN-407, OPEN-358]
 2015-01-06 21:58:56 -05:00
Chris Dodge
443a552d5f remove unused variable 2015-01-06 19:24:39 -05:00
Brian Talbot
9dd22206ae Merge pull request #6055 from edx/clrux/update-font-awesome-4.2.0-v2 
Upgrade: Font Awesome 4.2.0 - Take #2
 2015-01-06 18:36:44 -05:00
Sarina Canelake
4fcbcaa09b Clean up default Open edX pages 2015-01-06 18:27:16 -05:00
Sarina Canelake
61e02fab87 Hide Honor Code mentions if site does not have an Honor Code 2015-01-06 18:26:19 -05:00
Sarina Canelake
3a3ab76261 Change Open edX index page bright blue to grey 2015-01-06 18:26:19 -05:00
Sarina Canelake
682d3d0eae Organize logic on Find Courses view. 2015-01-06 18:26:19 -05:00
Sarina Canelake
b7a1de1ab0 Abstract references to social media accounts 2015-01-06 18:26:19 -05:00
Sarina Canelake
4a2253a07a Remove no-longer-used template 2015-01-06 18:26:18 -05:00
Sarina Canelake
d6741c7700 Clean up default pages for Open edX instances 
Remove Jobs, News
Change "Vision" to "About"
 2015-01-06 18:26:12 -05:00
Sarina Canelake
aa8b895aea Remove "legacy" footer now that new edx footer in place 2015-01-06 17:20:39 -05:00
Sarina Canelake
6c5542cd24 Change default welcome from mktg text to Open edX text 2015-01-06 17:20:39 -05:00
Sarina Canelake
ec87a14a8d Turn off welcome video by default on Open edX LMS index page 2015-01-06 17:20:39 -05:00
Dennis Jen
a8be702136 Merge pull request #6469 from edx/release 
hotfix-2015-01-06
 2015-01-06 17:16:32 -05:00
Sarina Canelake
0f66b7552f Merge pull request #6458 from edx/sarina/variablize-copyright-date 
Variablize copyright year for LMS footer
 2015-01-06 17:15:59 -05:00
Dennis Jen
2ff8f2faea Merge branch 'release' into rc/2015-01-07 2015-01-06 16:30:11 -05:00
David Baumgold
260962e06c Use "Studio" name by default (instead of "edX Studio") 2015-01-06 16:07:57 -05:00
Jim Abramson
7e506d421f Merge pull request #6457 from edx/jsa/bulk-ops-forums 
use modulestore bulk ops in forum views.
 2015-01-06 15:56:54 -05:00
Carlos Andrés Rocha
66b1778481 Merge pull request #6353 from rocha/set-revision-to-unknown-if-not-on-git-repo 
Set EDX_PLATFORM_REVISION to unknown if not in a git repo.
 2015-01-06 15:39:40 -05:00
Sarina Canelake
05afa2da17 Variablize copyright year for LMS footer 2015-01-06 15:35:54 -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
AlasdairSwan
9d7c90bee8 Merge pull request #6466 from edx/alasdair/logistration-history-query-params-fix 
Updated after Will's comments
 2015-01-06 13:01:23 -05:00
AlasdairSwan
a8a8cfd534 Updated after Will's comments 2015-01-06 11:48:05 -05:00
Renzo Lucioni
93a2e080e8 Merge pull request #6465 from edx/renzo/update-split-payment-verification-copy 
Apply most important copy changes from docs
 2015-01-06 11:46:14 -05:00
AlasdairSwan
a1104ceb6b Merge pull request #6464 from edx/alasdair/logistration-history-query-params-fix 
Updated history.push to include any query params
 2015-01-06 11:40:18 -05:00
AlasdairSwan
1d928379a1 Updated history.push to include any query params 2015-01-06 11:39:14 -05:00
Renzo Lucioni
fe691b051b Apply most important copy changes from docs 2015-01-06 11:31:12 -05:00
jsa
ce3c650cf9 use modulestore bulk ops in forum views. 
JIRA: PLAT-348
 2015-01-06 09:59:20 -05:00
chrisndodge
72bdd48fa5 Merge pull request #6460 from edx/muhhshoaib/rc-hotfix-redemption-page-css 
fixed the redemption page broken Css.
 2015-01-06 09:48:16 -05:00
Awais Qureshi
cb6a4db1d0 Merge pull request #6430 from edx/awais786/ECOM-662-decline-error 
Awais786/ecom 662 decline error
 2015-01-06 19:31:05 +05:00
Will Daly
adcfaaefd1 Merge pull request #6463 from edx/hotfix/ecom-872 
Fix ECOM-872
 2015-01-06 09:25:27 -05:00
Shrhawk
f6186aeda4 Merge pull request #6357 from Shrhawk/shr/bug/TNL-997-aria-disabled-need-to-added 
Add aria-disabled attribute
 2015-01-06 19:07:46 +05:00
Renzo Lucioni
af7620a1c3 Merge pull request #6454 from edx/alasdair/not-activated-decoupled-verification-update 
ECOM-869 Update copy and hide supplementary content wrapper and requirem...
 2015-01-06 08:30:02 -05:00