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

30735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
9bdf64d385 Merge pull request #8433 from edx/db/json-as-dicts 
Use dicts when defining JSON
 2015-06-09 11:15:56 -04:00
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
Ben Patterson
242b3736a0 Merge pull request #8429 from edx/benp/fix-flaky-lms-answer-jun2015 
Fix flaky lettuce test. TE-572.
 2015-06-09 10:44:19 -04:00
Utkarsh
7d33892284 Update testing.rst 2015-06-09 10:43:46 -04:00
David Baumgold
9643aca40e Use dicts when defining JSON 2015-06-09 10:02:58 -04:00
Utkarsh
00970a0f5a Update testing.rst 
Adding information about paver
 2015-06-09 10:02:49 -04:00
Awais Jibran
3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place 
Fixed cms course export using management command.
 2015-06-09 18:59:03 +05:00
Brian Talbot
0003bf7aaf Merge pull request #8319 from edx/talbs/UX-2011-v4 
Web Certificates: Add Base/Distinguished Print Styling - Take 3
 2015-06-09 09:38:05 -04:00
Ben Patterson
e54ce29587 Fix flaky lettuce test. TE-572. 
This should be ported to bok-choy, but until then we should fix the flakiness in
this test. It needs to wait for the page to change after the user clicks 'reset'.
 2015-06-09 09:37:36 -04:00
Greg Price
b91287bfe3 Merge pull request #8425 from edx/gprice/discussion-api-parent-id 
Use parent_id returned from the comments service
 2015-06-09 09:33:17 -04:00
Christine Lytwynec
73ce054c54 Merge pull request #8415 from edx/clytwynec/re-enable_acid_block_tests 
unskip acid xblock tests
 2015-06-09 09:31:34 -04:00
Awais Qureshi
ab46de59c2 Merge pull request #8407 from edx/awais786/ECOM-1644-course-access-roles 
ECOM-1644 Implementing course-access roles.
 2015-06-09 18:23:03 +05:00
Matt Drayer
c4175c7dc6 Merge pull request #8363 from edx/ziafazal/SOL-861 
refactored code to make certificate PDF generation optional
 2015-06-09 09:01:04 -04:00
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end 
pause_video event does not emit when a video ends
 2015-06-09 16:18:51 +05:00
Awais
956e41348e ECOM-1644 Implementing course-access roles. 2015-06-09 15:29:19 +05:00
Awais Jibran
3e6670d1a4 PLAT-643 
Fixed cms course export
 2015-06-09 11:19:46 +05:00
Kelketek
9a55497e72 Merge pull request #8417 from open-craft/badges-events-rename 
Tweaked names of badge events.
 2015-06-08 20:45:33 -05:00
Brian Talbot
33b7fbbbd4 UX-2011: adding print-based styles for Open edX web certs 2015-06-08 20:58:38 -04:00
Greg Price
2c7590d197 Use parent_id returned from the comments service 
This depends on cs_comments_service commit 0487891.
 2015-06-08 16:59:21 -04:00
Christopher Lee
96a9a7e7cc Merge pull request #8355 from edx/clee/discussion_api_delete_thread 
MA-661: Clee/discussion api delete thread
 2015-06-08 16:34:28 -04:00
Peter Fogg
8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation 
TNL-1891 Browse Teams: Category Subnavigation
 2015-06-08 16:32:41 -04:00
Chris
a5204310b1 Merge pull request #8267 from edx/clrux/UX-2078-error-heading-reduction 
Reducing size of error message heading
 2015-06-08 16:12:57 -04:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
christopher lee
30884d192b Added delete thread in discussion api 2015-06-08 15:43:39 -04:00
David Baumgold
6809d5e799 Merge pull request #8420 from edx/db/improve-openedx-readme 
Improve README for openedx directory
 2015-06-08 15:20:22 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
David Baumgold
3b34cb8407 Improve README for openedx directory 2015-06-08 15:11:54 -04:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation 
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
 2015-06-08 15:05:11 -04:00
Chris Rodriguez
402c3f329f Removing conflict from header 2015-06-08 14:59:17 -04:00
Chris Rodriguez
4fd1ebce1c Fixing test to match CSS 2015-06-08 14:55:56 -04:00
Jonathan Piacenti
ada51a3b31 Tweaked names of badge events. 2015-06-08 18:11:01 +00:00
Carol Tong
77395bdf0d Merge pull request #8366 from edx/carol/doc/StudioTempl_Certs 
DOC: Finalize Help targets, sidebar text for Studio Certificates page
 2015-06-08 13:44:32 -04:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 
Update edx-search dependency to reference latest edx-search
 2015-06-08 13:08:50 -04:00
Feanil Patel
924bbe6b9f Update github.txt to use a tag instead of a commit 2015-06-08 13:07:14 -04:00
Christine Lytwynec
7e19142b01 unskip acid xblock tests 2015-06-08 11:57:18 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Carol Tong
6aa7f810f3 DOC: Finalize Help targets, sidebar text for certificates 2015-06-08 11:36:11 -04:00
Xavier Antoviaque
688d62293b Merge pull request #8406 from antoviaque/badges-migration-fix 
Default to filestorage when S3 isn't configured (aws.py) - SOL-963
 2015-06-08 17:26:21 +02:00
Calen Pennington
69799cc1e0 Merge pull request #8344 from cpennington/update-xblock-repo 
Update XBlock dependency to use the merged commit from the edx repo
 2015-06-08 09:56:42 -04:00
Davorin Sego
40e89e6cb8 update edx-search commit reference 2015-06-08 15:31:14 +02:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py) 
Also moves the default icons to the badges subfolder to avoid storage conflicts.
 2015-06-08 11:30:16 +02:00
Zia Fazal
20800ea561 refactored code to make certificate PDF generation optional 
improved coverage

refactoring based on feedback

fixed quality violations

changes based on feedback
 2015-06-08 12:42:07 +05:00
Matt Drayer
fd737d4dce Merge pull request #8385 from edx/asadiqbal08/SOL-961 
(WIP) SOL-961 Student Generated Certificate Flow  shows "download" certificate
 2015-06-07 21:45:18 -04:00
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Ben Patterson
f37fdaf47d Merge pull request #8386 from edx/benp/lint-fix-test_import_export 
Follow imports order guidelines.
 2015-06-07 17:13:16 -04:00
Ben Patterson
dc4b4f9022 Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 
Skip test that has become too flaky. SOL-449.
 2015-06-07 13:32:04 -04:00
Kevin Falcone
82f7238f9d Merge pull request #8398 from edx/jibsheet/release-script-updates 
www.stage.edx.org is our Drupal site
 2015-06-07 11:45:02 -04:00
Ben Patterson
d3f7bdc1e8 Skip test that has become too flaky. SOL-449. 2015-06-07 10:43:53 -04:00
Matt Drayer
96c09f6bc0 Merge pull request #8378 from edx/mattdrayer/SOL-947 
mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns
 2015-06-07 07:45:10 -04:00