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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
4e1925129e Add URL download endpoint for Studio video uploads 
The endpoint returns an Excel-dialect CSV file for download.
 2015-01-09 19:45:31 -05: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
Dennis Jen
0e03834d00 Merge pull request #6524 from edx/hotfix/2014-01-09 
Handle children pointers to non-existent children in has_changes
 2015-01-09 15:58:59 -05:00
David Baumgold
03d20e09fa Merge pull request #6537 from edx/translate-brands 
Translate link titles
 2015-01-09 15:55:34 -05:00
David Baumgold
a6f3edcad5 Translate link titles 2015-01-09 15:10:44 -05:00
David Baumgold
3b9001fca5 Merge pull request #6533 from edx/social-icon-classes 
Make all the social links show icons
 2015-01-09 15:05:28 -05:00
David Baumgold
7fe267b261 Make all the social links show icons 2015-01-09 14:27:59 -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
Dennis Jen
592665cc6e Merge pull request #6512 from edx/hotfix/2015-01-09b 
fix studio templating errors
 2015-01-09 11:24:57 -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
cae70d9966 Move default Open edX branding into default-theme directory 
OPEN-307
 2015-01-09 10:49:17 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS 
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
David Baumgold
582d1e1285 Merge pull request #4274 from edx/db/update-pylint 
Update pylint to 1.4.0
 2015-01-09 09:39:37 -05:00
Jesse Zoldak
e77acdf401 Add debug logging to video tests 2015-01-09 09:39:02 -05:00
chrisndodge
c5746e6db9 Merge pull request #6071 from edx/muhhshoaib/WL-135-add-expiration-dates-to-Coupon-codes 
Add expiration dates to Coupon Codes
 2015-01-09 09:19:17 -05:00
Dennis Jen
17c2af2325 Merge pull request #6513 from edx/release 
Merge release back into master
 2015-01-09 09:15:57 -05:00
arbisoft
d244b13445 Merge remote-tracking branch 'origin/aamir-khan/ECOM-528-donation-verified-courses' into aamir-khan/ECOM-528-donation-verified-courses 
Conflicts:
	common/djangoapps/student/tests/test_recent_enrollments.py
 2015-01-09 17:56:32 +05:00
arbisoft
36626a2b8b ECOM-528 added test cases 2015-01-09 17:55:22 +05:00
Jesse Zoldak
d29127055e Merge pull request #6509 from edx/zoldak/fix-textbook-test 
Fix flaky textbook upload lettuce tests
 2015-01-09 07:45:05 -05:00
Waheed Ahmed
72a2998ed5 Merge pull request #6475 from edx/waheed/tnl1070-Ordering-is-not-enforced 
Enforced '000' prefix for xmodule.js and added unit test.
 2015-01-09 17:25:48 +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
Awais
507d7b1a1f ECOM-528 refactor the code. 2015-01-09 16:26:35 +05:00
Muhammad Shoaib
10f8d8c097 WL-135 added the migration for the expiration_date field in the coupons model 
added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart

added expiration date in the coupons list in the ecommerce page

added the unit tests and jasmine tests

fix the quality issues and rebased with master

regenerated the migration file with a different number

i18n and verified te course mode

changes suggested by  stephan
 2015-01-09 19:14:48 +08:00
Awais
866ddc22e9 ECOM-528 refactor the code. 2015-01-09 15:17:27 +05:00
arbisoft
7eb8195c23 ECOM-528 added donation support for verified courses 2015-01-09 12:31:33 +05:00
Adam Palay
63431d1ffd fix studio templating errors 2015-01-08 19:47:15 -05:00
Adam
240c2953e7 Merge pull request #6507 from edx/hotfix/2015-01-09 
set studio_name in aws.py (TNL-1138)
 2015-01-08 19:45:43 -05:00
Jesse Zoldak
3efb377d1c Fix flaky textbook upload lettuce tests 2015-01-08 16:52:55 -05:00
David Baumgold
30b572b1b1 Merge pull request #6489 from edx/replace-edx-platform-name 
Replace "edX" with {platform_name}
 2015-01-08 16:36:54 -05:00
Adam Palay
62157f3725 set studio_name in aws.py (TNL-1138) 2015-01-08 16:28:01 -05:00
David Baumgold
d6b187d147 Update pylint to 1.4.0 2015-01-08 16:24:44 -05:00
Dennis Jen
4a37648f36 Merge pull request #6504 from edx/release-merge-test 
Merge release (2015-01-08) into master
 2015-01-08 16:16:03 -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