Jesse Zoldak
586d798069
Fix flakiness on annotation selenium test
2015-01-09 13:53: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
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
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
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
Christine Lytwynec
66228224c0
Merge pull request #6403 from edx/clytwynec/remove_lynx_from_bulk_email
...
Mock html_to_text.py for unit tests
2015-01-08 14:10:12 -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
David Baumgold
44b792ab26
Replace "edX" with {platform_name}
2015-01-08 11:32:26 -05:00
Ben Patterson
f7e1bfe732
Merge pull request #6491 from edx/benp/add-cleanup-paver-tests
...
Stop mocks after test.
2015-01-08 11:14:21 -05:00
David Baumgold
a54bff2992
Merge pull request #6487 from edx/remove-linkedin-integration
...
Remove LinkedIn integration
2015-01-08 10:18:25 -05:00
Nimisha Asthagiri
3498eeb1f6
MA-212 Mobile API support for backward compatibility of course updates.
2015-01-08 10:05:29 -05:00
David Baumgold
ed2afa8aaf
Merge pull request #6486 from edx/emails-remove-edx
...
clean up reject_name_change email template a bit
2015-01-08 09:59:49 -05:00
David Baumgold
6efe0ac382
Merge pull request #6485 from edx/discussion-platform-name
...
Use {platform_name} in discussions header
2015-01-08 09:34:25 -05:00
Muhammad Ammar
a7339ce734
Merge pull request #6214 from edx/ammar/tnl498
...
Get students experiments, groups, and cohorts
2015-01-08 15:14:54 +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
Nimisha Asthagiri
3c274e2847
Merge pull request #6398 from edx/mobile/MA-199
...
MA-199 Course Authorization framework in mobile API
2015-01-07 20:19:27 -05:00
Nimisha Asthagiri
5349b55bd0
MA-199 Course Authorization framework in mobile API.
2015-01-07 19:31:02 -05:00
Ben Patterson
d256c82582
Stop mocks after test.
2015-01-07 17:07:34 -05:00
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
