Commit Graph

10079 Commits

Author SHA1 Message Date
Ben Patterson
2dd3cd8659 Fix pep8 violation. 2015-01-29 12:20:23 -05:00
David Baumgold
6134bedfca Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu
Add classes to cohort selector element group
2015-01-29 11:49:33 -05:00
Mark Hoeber
dd857fb464 Merge pull request #6760 from edx/markhoeber-doc1510
Platform API Doc Update
2015-01-29 11:34:03 -05:00
Mark Hoeber
1d738527b6 Platform/Mobile API doc updates 2015-01-29 10:19:35 -05:00
srpearce
30966eb618 Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI
Update UI text for enrollment codes
2015-01-29 10:01:42 -05:00
Matt Drayer
495583ac7d Merge pull request #6782 from edx/mattdrayer/generalize-entrance-exam-scoring
Decoupled entrance exam scoring from milestone fulfillment
2015-01-28 23:15:58 -05:00
Matt Drayer
8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment 2015-01-28 22:00:25 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Jonathan Piacenti
bd57d56bdd Add classes to group of elements for cohort selector.
Retriggring Jenkins build
2015-01-28 22:51:46 +00:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit b8184d188f.
2015-01-28 17:26:46 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links
make course requirement as link
2015-01-28 16:56:35 -05:00
Renzo Lucioni
3f8ca96f02 Change instances of 'register' to 'enroll' 2015-01-28 14:37:26 -05:00
Mark Sadecki
8cffa152d8 changes the skip link text to the industry standard Skip to main content 2015-01-28 11:07:10 -05:00
Anton Stupak
f1fbd0f969 Merge pull request #6789 from edx/anton/edxnotes-fix-tests
Fix unit tests.
2015-01-28 16:32:10 +02:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02:00
chrisndodge
5364ccf1c5 Merge pull request #6755 from edx/muhhshoaib/removing-extra-condition-from-pdf-file
removed the is_invoice condition from the pdf file
2015-01-28 00:06:14 -05:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms
Add RequireJS to the LMS
2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS
[second attempt which addresses bug building Studio]
2015-01-27 17:56:29 -05:00
Anton Stupak
838569d19b Merge pull request #6692 from edx/anton/edxnotes-fix-text-line-breaks
TNL-1078: Lines don't break correctly in Student Notes.
2015-01-27 20:49:23 +02:00
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests
Fix intermittent failures in bok-choy tests of payment and verification
2015-01-27 13:32:10 -05:00
stephensanchez
5788a74291 Fix ecommerce test for text changes. 2015-01-27 18:13:36 +00:00
Carson Gee
7347e3bd4a Add missing sysadmin dashboard unicode cast 2015-01-27 11:22:45 -05:00
polesye
bd42a39468 TNL-1078: Lines don't break correctly in Student Notes. 2015-01-27 18:09:11 +02:00
Shrhawk
61e9519b53 Merge pull request #6709 from edx/shr/bug/TNL-1229-Burst-errors
Invalid youtube_id raise NotFoundError for transcripts
2015-01-27 20:29:13 +05:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts
TNL-1229
2015-01-27 11:48:08 +05:00
Sylvia Pearce
0f9b501d0b Update UI text for enrollment codes 2015-01-26 22:31:08 -05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00
polesye
df86a3312f TNL-1132: Fix viewer behaviour on hover. 2015-01-26 10:53:44 +02:00
Muhammad Shoaib
2c1676f2ee removed the is_invoice condition from the pdf file 2015-01-26 12:56:31 +05:00
Sarina Canelake
fdb490d121 Merge pull request #6728 from OmarIthawi/edraak/omarithawi/social-login-icons-rtl
RTL margins for 3rd-party auth button icons
2015-01-25 09:19:18 -05:00
swdanielli
47b3eae78f Merge pull request #6470 from edx/danielli/recommender_code_review
code review
2015-01-23 17:39:09 -05:00
swdanielli
ed8fea79c2 update accessibility 2015-01-23 16:13:26 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20
Rc/2015 01 20
2015-01-23 16:10:28 -05:00
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release
Release
2015-01-23 16:10:00 -05:00
Stephen Sanchez
6616b7b5c9 Merge pull request #6731 from edx/sanchez/cache_course_enrollment_details
Adding caching to the course details endpoint for the Enrollment API.
2015-01-23 08:55:02 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
Chris Dodge
74f6380e9e Change coupon CSV download to only include counts for coupons redeemed all the way through purchase
updated the failed unit test case and removed the unnessary import
2015-01-23 00:21:58 +05:00
Chris Dodge
6bfe20b9a9 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-22 13:33:23 -05:00
Omar Al-Ithawi
a5c0b6e29a RTL margins for 3rd-party auth button icons 2015-01-22 17:49:47 +02:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due
Make LTI grade submissions respect deadlines
2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit 1d6fceda50.
2015-01-21 17:13:27 -05:00
Sarina Canelake
e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails
Render enrollment emails in the student's language
2015-01-21 16:40:51 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms
Add RequireJS and RequireJS Optimizer configuration to the LMS
2015-01-21 15:23:35 -05:00