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
7188c3a328
Factored out Pagination into its own Container view.
2015-01-12 13:37:55 +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
Waqas Khalid
80e0d56afd
Merge pull request #6368 from sjackso/login_error_fix
...
Login error fix TNL-140
2015-01-12 15:06:15 +05:00
Renzo Lucioni
7a9ec6bd7a
Merge pull request #6546 from edx/renzo/fix-jasmine-tests
...
Prevent Jasmine tests from redirecting in dev mode
2015-01-11 17:07:11 -05:00
Renzo Lucioni
8ef0e77e46
Prevent Jasmine tests from redirecting in dev mode
...
Also prevent Jasmine from attempting to load deleted templates
2015-01-11 16:08:29 -05:00
Nimisha Asthagiri
66e6d1cf7a
Merge pull request #6352 from edx/gprice/video-upload-csv
...
Add CSV download button to Studio video upload page
2015-01-09 21:48:54 -05:00
Nimisha Asthagiri
4b53f4df27
Studio video upload CSV download changes.
2015-01-09 20:48:48 -05:00
Greg Price
8d8ca83d94
Add download button to Studio video upload page
...
The button downloads the CSV data containing all video URLs.
2015-01-09 19:45:31 -05:00
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
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
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
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
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
Waheed Ahmed
18f3221dcf
Enforced '000' prefix for xmodule.js and added unit test.
...
TNL-1070
2015-01-09 16:30:42 +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
Adam Palay
63431d1ffd
fix studio templating errors
2015-01-08 19:47:15 -05:00
