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

11231 Commits

Author SHA1 Message Date
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
Greg Price
6c2df96c5f Merge pull request #8372 from edx/gprice/discussion-api-follow-thread 
Add ability to follow a thread in discussion API
 2015-06-05 14:12:29 -04:00
Greg Price
9ff8749716 Add ability to follow a thread in discussion API 2015-06-05 13:20:57 -04:00
Nimisha Asthagiri
65bcc50e9b Merge pull request #8240 from edx/mobile/render_xblock 
MA-722 Render xBlock API
 2015-06-05 12:13:05 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
AlasdairSwan
c820ae146a Merge pull request #8374 from edx/alasdair/ECOM-1684-new-footer-style-updates 
ECOM-1684 updated footer styles in line with Marketing requests
 2015-06-05 08:05:29 -04:00
Matt Drayer
dc5f650338 Merge pull request #8371 from edx/mattdrayer/SOL-953 
mattdrayer/SOL-953: Remove Mako UNDEFINED overrides
 2015-06-04 21:10:52 -04:00
Greg Price
ec088193e4 Merge pull request #8376 from edx/release 
Merge release to master
 2015-06-04 21:03:02 -04:00
srpearce
d4b99561d1 Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM 
Sylvia/docs/sol ecom
 2015-06-04 17:35:03 -04:00
Matt Drayer
803a73fdad mattdrayer/SOL-953: Remove Mako UNDEFINED overrides 2015-06-04 16:56:24 -04:00
AlasdairSwan
a819f5f389 ECOM-1684 updated footer styles in line with Marketing requests 2015-06-04 15:40:29 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may 
enroll in a course but have not signed up yet.
 2015-06-04 20:50:04 +02:00
Greg Price
298ba727bd Merge pull request #8311 from edx/gprice/discussion-api-edit-thread 
Add thread editing to discussion API
 2015-06-04 13:51:08 -04:00
Greg Price
59f72b554f Enable VAL URLs even when mobile API is disabled 
JIRA: MA-799
 2015-06-04 12:56:22 -04:00
Peter Fogg
a9187e81c5 Merge pull request #8339 from edx/peter-fogg/teams-header 
Implement teams header component
 2015-06-04 12:45:09 -04:00
Xiaolu Xiong
4f45839211 Merge pull request #8325 from beardeer/master 
Merge pull request #8325 from beardeer/edx-platform
 2015-06-04 11:45:15 -04:00
Daniel Friedman
8dfb774565 Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting 
Add support for public/internal edx-notes-api endpoints
 2015-06-04 11:32:33 -04:00
Adam
5952906e72 Merge pull request #8349 from edx/adam/fix-capa-devstack 
disable contracts that were breaking capa problems on devstack (TNL-2…
 2015-06-04 11:22:17 -04:00
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
Greg Price
73d891313a Add thread editing to discussion API 
This is done via PATCH on a thread instance endpoint.
 2015-06-04 10:56:43 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
Kevin Falcone
8f016414f9 Merge pull request #8348 from edx/release-2015-06-02-conflict 
Release 2015 06 02 conflict
 2015-06-04 09:20:12 -04:00
Xiaolu Xiong
aa1bca6b41 Change the misleading doc string (str doesn't has attr 'name' ) 2015-06-04 08:30:38 -04:00
frances botsford
446e2aa7f3 Merge pull request #7859 from edx/frances/teams-ux 
UX templates for Teams
 2015-06-04 08:07:05 -04:00
Mushtaq Ali
c575c89853 Bug - Unicode character in tab number shouldn't return 500 #TNL-2055 
Adding user to AUTHORS file
 2015-06-04 12:33:06 +05:00
Chris Dodge
ceb0fc79d0 update tests to match text changes 2015-06-03 19:00:46 -04:00
Clinton Blackburn
dbfd77e661 Disabled CSRF Validation for checkout cancel page 
CyberSource will POST to this view if the user cancels payment. CSRF validation cannot be enabled when this happens.

ECOM-1689
 2015-06-03 17:14:21 -04:00
Sylvia Pearce
2c7405940e Update enrollment code confirmation emails 2015-06-03 16:35:23 -04:00
Sylvia Pearce
99dfe98ac1 Update Instructor Dashboard UI text for enrollment codes 2015-06-03 16:35:23 -04:00
Sylvia Pearce
c482fce9d6 Update UI text for Saudi e-commerce features on the Instructor Dashboard 2015-06-03 16:35:22 -04:00
chrisndodge
bfe7527686 Merge pull request #8292 from edx/muhhshoaib/SOL-916-invalidate-revalidate-registration-codes 
SOL 916 invalidate revalidate registration codes
 2015-06-03 16:24:38 -04:00
Adam Palay
6012a34765 disable contracts that were breaking capa problems on devstack (TNL-2343) 2015-06-03 16:17:30 -04:00
Kevin Falcone
fecd3d55a7 Merge branch 'release' 2015-06-03 16:12:32 -04:00
Sarina Canelake
f78be26a5e Merge pull request #8341 from mcgachey/mcgachey-lti-consumer-bugfix 
[LTI Provider] Bugfix in LtiConsumer handling code
 2015-06-03 15:36:40 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Frances Botsford
cf89f3a62f base teams space (template) and create team form 2015-06-03 14:51:28 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Phil McGachey
71ee9d3bb8 [LTI Provider] Bugfix in LtiConsumer handling code 
The line below was left in during the refactoring shuffle from PR #8205, and causes
an issue in a corner case where an LTI launch provides an instance GUID where there
wasn't one already set for the consumer. This change fixes the bug, and adds a test
to prevent it from recurring.
 2015-06-03 14:34:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Chris
162ba962fb Merge pull request #8273 from edx/clrux/UX-2092-logistration-button-text-centered 
Centering text in sign in button vertically
 2015-06-03 13:57:10 -04:00
David Baumgold
fe66625bbf Merge pull request #8323 from edx/db/unify-mako-template-imports 
Group imports together in Mako templates
 2015-06-03 13:32:27 -04:00
Chris Rodriguez
ffad558fb1 Centering text in sign in button vertically 2015-06-03 13:07:49 -04:00
Chris
801b77d100 Merge pull request #8269 from edx/clrux/UX-2260-social-login-button-hoverz 
Removing background-image from button hovers
 2015-06-03 12:47:07 -04:00
Chris
30c7f00a80 Merge pull request #8303 from edx/clrux/UX-2077-lms-footer-styles 
Replacing top border on footer
 2015-06-03 12:38:51 -04:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Christopher Lee
103ae47759 Merge pull request #8199 from edx/clee/get_topic_threads 
MA-642 Add topic_id query to discussion/thread api
 2015-06-03 12:29:05 -04:00
Daniel Friedman
58c3c0c2d7 Expose EDXNOTES_PUBLIC_API/EDXNOTES_INTERNAL_API 2015-06-03 12:09:45 -04:00
Ali Mohammad
94e98e9cae Merge pull request #8257 from edx/alawibaba/plat589 
Make clean_history.py use the StudentHistoryModule django model.
 2015-06-03 11:45:33 -04:00
christopher lee
f552eca7d6 MA-642 Add topic_id query to discussion/thread api 
Also added thread_list_url field.
 2015-06-03 11:29:48 -04:00
Diana Huang
6534503c93 Add teams tab 
TNL-1939
 2015-06-03 09:10:44 -04:00