Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

35515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syed Hassan Raza
36db063566 set path explicitly for storing cookie 2015-12-07 14:10:58 +05:00
Syed Hassan Raza
706716694a Update handout link with current course_id 2015-12-07 13:21:10 +05:00
Eugeny Kolpakov
e908b569eb Merge pull request #10823 from edx/hash_update/XBlock 
Dependency update: Bumped XBlock version
 2015-12-07 10:37:53 +07:00
Chris Dodge
1592a32de3 White Labels need to still use the 'honor' course mode even through the default has changed 2015-12-06 20:36:26 -05:00
Sarina Canelake
af9cff47e5 Merge pull request #10837 from edx/kill-licenses 
Remove "Licenses" djangoapp
 2015-12-06 11:39:15 -05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00
Sarina Canelake
af8a0bb676 Remove "Licenses" djangoapp 2015-12-06 10:55:15 -05:00
David Ormsbee
67a31ac577 Add course/org info to New Relic in courseware and XBlock rendering. 
This will make it much easier for us to slice courseware requests by
organization and course in Insights performance analysis.
 2015-12-04 20:06:24 -05:00
Braden MacDonald
a654d5e7ac Add additional data to custom SSO auth form extension points 2015-12-04 15:38:18 -08:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho 
Remove psychometrics app
 2015-12-04 17:23:20 -05:00
Nimisha Asthagiri
7429a32ba8 Merge pull request #10799 from edx/mobile/course-api-fields-MA-1661 
Update Course About API to include effort and video (MA-1661)
 2015-12-04 17:17:21 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
Nimisha Asthagiri
4a530690e1 Remove unused "has_cert_config" field on CourseDetails. 2015-12-04 16:03:06 -05:00
Nimisha Asthagiri
91153aea83 Update Course About API to include effort and video 
MA-1661
 2015-12-04 16:03:06 -05:00
Nimisha Asthagiri
d6ced072c4 Refactor CourseDetails 2015-12-04 16:03:05 -05:00
AlasdairSwan
2470072a41 Merge pull request #10830 from edx/alasdair/ECOM-2824-fa-form 
ECOM-2824 Financial Assistance Form
 2015-12-04 15:55:04 -05:00
alasdairswan
56ba7850a0 Integrated JS with Peter's Django wrapper 
Rendering form. Updated form field template to accept instructions for all input types
Added setExtraData function to FormView to allow non-form attributes to be added to the model before saving
 2015-12-04 15:54:34 -05:00
Sarina Canelake
92a436b11b Merge pull request #10834 from edx/kill-admin-dash 
Remove admin dashboard (AN-3351)
 2015-12-04 15:41:39 -05:00
M. Rehan
568bbf9549 Merge pull request #10767 from edx/mrehan/TNL-3821 
fix wiki alertbox style
 2015-12-05 01:05:36 +05:00
Christine Lytwynec
3b217df917 add new tests for auto_auth redirecting 2015-12-04 15:04:42 -05:00
Sarina Canelake
f7e141b147 Remove admin dashboard (AN-3351) 2015-12-04 14:39:19 -05:00
frances botsford
e9a323405b Merge pull request #10609 from edx/frances/adjust-studio-cert-limits 
Add certificates signatory limit help text in Studio
 2015-12-04 13:14:28 -05:00
chrisndodge
2677540543 Merge pull request #10828 from edx/release 
Merge pull request #10725 from edx/rc/2015-11-24
 2015-12-04 13:07:49 -05:00
Feanil Patel
bdd701d29f Merge pull request #10826 from edx/feanil/one_down 
Remove This awful code
 2015-12-04 12:57:05 -05:00
Ned Batchelder
e0ef89ed3c Merge pull request #10827 from edx/ned/20151204-update-translations 
Update translations (autogenerated message)
 2015-12-04 12:25:18 -05:00
Clinton Blackburn
01f0e2e37c Merge pull request #10824 from edx/clintonb/credit-auth-fix 
Corrected permission class and test
 2015-12-04 11:52:27 -05:00
Ned Batchelder
0ff6cb1447 Update translations (autogenerated message) 2015-12-04 16:37:52 +00:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Peter Fogg
9401beb837 Merge pull request #10787 from edx/peter-fogg/fa-page 
Add financial assistance page skeleton and Zendesk submission.
 2015-12-04 11:12:06 -05:00
Feanil Patel
356a175969 Remove This awful code 
We no longer have XML courses so we don't need to compile their coffee script.
 2015-12-04 11:11:01 -05:00
Clinton Blackburn
c90880719f Corrected permission class and test 
- The permission now checks the correct request attribute (GET instead of data).
- The Credit API view test has been updated to check for the positive access instead of just denial.

 ECOM-3096
 2015-12-04 10:18:53 -05:00
Matt Drayer
c41a887762 Merge pull request #10805 from edx/saleem-latif/SOL-1435 
SOL-1435: Add Certificate Regeneration history table.
 2015-12-04 09:56:18 -05:00
Mark Sadecki
e10614e75a adds support to auth_auth for redirecting 2015-12-04 09:45:09 -05:00
Peter Fogg
66719b1b4a Add financial assistance page. 
Page skeleton and endpoint to submit FA requests to Zendesk.

ECOM-2824
ECOM-3038
 2015-12-04 09:39:22 -05:00
David Baumgold
684239892d Merge pull request #10782 from pomegranited/master 
MA-240 Added window beforeunload handler to the ActiveVideoUploadList…
 2015-12-04 09:17:49 -05:00
Ahsan Ulhaq
2e76517ab3 Merge pull request #10820 from edx/ahsan/ECOM-2929-Update-Track-Selection-page 
Update Track Selection page
 2015-12-04 13:03:11 +05:00
E. Kolpakov
bed4babb5e Bumped XBlock version 2015-12-04 14:43:42 +07:00
Awais
198d33dc13 New AB Testing URL for checkout page. 
ECOM-2866
 2015-12-04 07:04:59 +00:00
Saleem Latif
1e16e873a4 Add Certificate Regeneration history table. 2015-12-04 10:24:02 +05:00
Jillian Vogel
b7f0836be8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	AUTHORS
 2015-12-04 11:26:55 +10:30
Peter Fogg
068b439ada Merge pull request #10821 from edx/peter-fogg/fix-certs-tests 
Fix broken certificates-related tests.
 2015-12-03 18:00:16 -05:00
David Baumgold
31b6f8cc7f Merge pull request #10090 from edx/db/edx.org-comp-theme 
Re-enable the edx.org comprehensive theme
 2015-12-03 17:28:20 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -05:00
Ned Batchelder
d344d6f80a Merge pull request #10815 from edx/ned/add-translator-comments 
Add translator comments
 2015-12-03 16:46:03 -05:00
Peter Fogg
1ba1c213d5 Fix broken certificates-related tests. 2015-12-03 16:30:05 -05:00
Jillian Vogel
6fd5ba5a69 MA-240 Added window beforeunload handler to the ActiveVideoUploadList view, 
which shows a notification if there are any "Queued" or "Uploading" videos still in progress.
 2015-12-04 07:38:22 +10:30
Jillian Vogel
cbcd96dfbe MA-204 Added self to AUTHORS 2015-12-04 07:38:17 +10:30
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Ned Batchelder
ed96a9d87a Add translator comments 
There are English words in these strings, but they are actually specific
values that must appear as these English words, and so should not be
translated.
 2015-12-03 14:47:08 -05:00