Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

32165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
5d356d29bd Corrected path to Commerce API 
XCOM-312
 2015-07-07 11:47:45 -04:00
Sarina Canelake
e9756a9bc7 Merge pull request #8799 from edx/revert-8722-utkjad/injecting_callstackmanager 
Revert "Adding entries of Call Stack Manager in StudentModule and Stu…
 2015-07-07 11:21:19 -04:00
Awais
cc5d972c7d ECOM-1829 Removing the regen link. 2015-07-07 19:53:53 +05:00
Christine Lytwynec
7af1a44d73 Merge pull request #8792 from edx/clytwynec/flaky-test 
flag test as flaky
 2015-07-07 10:08:25 -04:00
Daniel Friedman
c689cc40e0 Merge pull request #8766 from edx/dan-f/update-test-docs-common-requirejs 
Update docs for testing common requirejs tests
 2015-07-07 09:37:15 -04:00
Marko Jevtić
1c161ffc5f Merge pull request #8793 from edx/mjevtic/env-devstack-fix 
Fixed misordered settings for devstack environment
 2015-07-07 15:14:24 +02:00
Marko Jevtic
d09bfa5e99 Fixed misordered settings for devstack environment 2015-07-07 12:01:12 +02:00
aamir-khan
935da3a12c ECOM-1601: Added the help link of credit info 2015-07-07 09:58:48 +00:00
Sarina Canelake
b26f2af585 Revert "Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory" 2015-07-07 05:45:23 -04:00
Clinton Blackburn
301a874c5c Enforcing lowercase currency for CourseMode 
- CourseMode.save() always lowercases the currency value
- CourseMode currency comparisons have been updated to be case-insensitive
 2015-07-06 23:38:25 -04:00
Clinton Blackburn
96ee90d567 Merge pull request #8772 from edx/clintonb/refund-notification 
Creating Zendesk refund notifications via API
 2015-07-06 20:26:01 -04:00
Davorin Šego
ad5a98e40a Merge pull request #8282 from Stanford-Online/giulio/default-course-about-images 
Default "Course About" image
 2015-07-07 00:24:54 +02:00
Clinton Blackburn
40282316d0 Creating Zendesk refund notifications via API 
Refund notifications are now created using the Zendesk API. This ensures the correct requester information is set for the ticket, and allows for tagging of tickets.

XCOM-451
 2015-07-06 17:36:14 -04:00
Ahsan Ulhaq
796e4cb5e6 Merge pull request #8580 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API-update 
LMS: Modification in enrollment API
 2015-07-07 02:32:53 +05:00
Christine Lytwynec
db516a9b4c flag test as flaky 2015-07-06 16:51:03 -04:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
 2015-07-06 16:45:24 -04:00
David Baumgold
d3a5bc32b3 Merge pull request #8780 from edx/db/mention-confluence-in-readme 
Mention Confluence in the README
 2015-07-06 16:40:49 -04:00
Matt Drayer
685a2d31b3 Merge pull request #8774 from edx/ziafazal/SOL-1008 
ziafazal/SOL-1008: Ensure that only authorized actors can perform assigned roles
 2015-07-06 15:57:28 -04:00
Matt Drayer
669b5d2b1b Merge pull request #8789 from edx/carol/doc/SOL-1014_test 
asadiqbal08/SOL-1014: Improved text in Studio Certificate Configuration
 2015-07-06 15:57:06 -04:00
Will Daly
e67975b275 Feature flag credit provider messaging on the dashboard. 
When the credit eligibility is disabled, skip the code
that access the CreditProvider table.  This will allow us
to safely delete a column from the table in rc/2015-07-08.
 2015-07-06 12:56:15 -07:00
Ahsan Ulhaq
8d9d4b85d5 LMS: Modification in enrollment API 
Changed enrollment api to set enrollment atributes if the course is
credit course

ECOM-1719
 2015-07-07 00:49:02 +05:00
asadiqbal
2e4f1225ea Improved text in Studio Certificate Configuration 2015-07-06 15:35:32 -04:00
Utkarsh
07ce76b3f9 Merge pull request #8722 from edx/utkjad/injecting_callstackmanager 
Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory
 2015-07-06 15:06:06 -04:00
utkjad
10a3863832 Enable CallStackManager on StudentModule and StudentModuleHistory to capture any use outside of DjangoXBlockUserStateClient 2015-07-06 18:11:05 +00:00
Chris Rodriguez
45c1f28d5f Fixing aria values and contrast for accessibility 2015-07-06 14:02:18 -04:00
Giulio Gratta
84f7aef917 Default "Course About" image 
Templates that display the image now check if courses specifies an image, if they don't the default image is displayed

Path set in both common.py and aws.py to allow for easy overriding in one place.

Addresses SOL-926

Some code provided by Davorin Sego
 2015-07-06 10:29:12 -07:00
Will Daly
47002ff785 Merge pull request #8785 from edx/will/fix-credit-migrations 
Fix migrations 0012 and 0013 in the credit app
 2015-07-06 10:20:02 -07:00
Christine Lytwynec
f3caef9b8f Merge pull request #8762 from edx/clytwynec/TE-965 
Clytwynec/te 965
 2015-07-06 13:07:18 -04:00
Will Daly
dcfd70b922 Fix migrations 0012 and 0013 in the credit app 
Adds the "order" field that was introduced in 0011 to the "models"
dictionary of migrations 0012 and 0013 so South knows that
the field should exist after 0011 is run.
 2015-07-06 10:01:32 -07:00
Akiva Leffert
f0b52c698d Merge pull request #8739 from edx/aleffert/remove-chromeless-xblock-border 
Remove border from chromeless xblock
 2015-07-06 11:37:29 -04:00
Christine Lytwynec
ab79b0dd1a add coveralls 2015-07-06 11:10:59 -04:00
David Baumgold
8d5c1a055c Mention Confluence in the README 2015-07-06 10:58:48 -04:00
Awais Jibran
770b3e807e Merge pull request #8499 from edx/aj/tnl2435-broken-page-for-schedule-details-cms 
Fixed Broken page in "Schedule & Details" due to course image
 2015-07-06 19:50:21 +05:00
Davorin Šego
e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum 
Fixes header styling issue introduced in SOL-734 (#8389) by reverting…
 2015-07-06 16:18:00 +02:00
Shrhawk
a67d80c232 Merge pull request #8702 from edx/shr/bug/TNL-2592-problem-release-date-error 
Handle dates have year smaller than 1900
 2015-07-06 06:39:11 -07:00
Awais Jibran
ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 
TNL-2435
 2015-07-06 18:26:00 +05:00
Daniel Friedman
c4004e1113 Merge pull request #8593 from edx/dan-f/topic-list-2 
Teams Topic List View
 2015-07-06 09:23:31 -04:00
Sarina Canelake
bc4479a118 Merge pull request #8778 from edx/sarina/20150706-update-translations 
Update translations (autogenerated message)
 2015-07-06 09:17:18 -04:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI 
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Sarina Canelake
1cc7ea2a37 Update translations (autogenerated message) 2015-07-06 08:14:16 -04:00
Awais Jibran
a14a562ed6 Fixed randomized problems which were not appearing to work. 
TNL-2551
 2015-07-06 15:29:59 +05:00
Zia Fazal
9711cd5fc3 certificate add/update/delete operations permission check 
address quality violation
 2015-07-06 09:45:33 +05:00
Ben Patterson
65a36a64df Merge pull request #8686 from edx/benp/3bok-choy-check-invisible 
Update to latest bok-choy. Update tests to be compatible with the updated `invisible` property.
 2015-07-03 17:36:09 -07:00
Usman Khalid
e086bb4ddc Merge pull request #8704 from edx/usman/tnl2305-disable-ora 
Hide ORA 1 in LMS.
 2015-07-04 00:35:05 +05:00
Usman Khalid
64ff890ff8 Disable ORA 1 tabs in LMS if combinedopeneded is disabled in LMS. 
TNL-2305
 2015-07-03 20:58:42 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
Davorin Šego
83d920ecba Merge pull request #8759 from edx/dsego/SOL-958 
Add feature flag to skip enrollment start date filtering for course s…
 2015-07-03 16:20:21 +02:00
Ben Patterson
8d9c16ba6e Update comment to match method name. 2015-07-03 06:54:56 -07:00