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

11256 Commits

Author SHA1 Message Date
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
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
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
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -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
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
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
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Kelketek
c8b8717944 Merge pull request #8399 from open-craft/fix-badging-name 
Fix self-paced badge naming.
 2015-06-06 09:31:02 -05:00
Jonathan Piacenti
eba951fe69 Fix self-paced badge naming. 2015-06-06 13:44:35 +00:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Greg Price
c5dc84f891 Merge pull request #8394 from edx/gprice/discussion-api-vote-thread 
Add thread voting to discussion API
 2015-06-05 23:12:41 -04:00
chrisndodge
6b40a6e2ab Merge pull request #8393 from edx/sylvia/docs/ECommerceTabUI 
Change name of section from Sales to Course Seat Purchases
 2015-06-05 21:52:50 -04:00
Greg Price
37ebbc45e3 Add thread voting to discussion API 2015-06-05 16:12:54 -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
Sylvia Pearce
eabc4c2488 Change name of section from Sales to Course Seat Purchases 2015-06-05 14:00:46 -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
Chris Rodriguez
9af7cb9b97 Removing uppercase requirement 2015-06-04 10:55:32 -04:00
Chris Rodriguez
c6e8ef010b Reducing size of error message heading 2015-06-04 10:55:32 -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