Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,160 Commits 1 Branch 0 Tags
8fcf574029786fc3d4e84dc50af05262bbab5eb9
Commit Graph

1958 Commits

Author SHA1 Message Date
Feanil Patel
bdd701d29f Merge pull request #10826 from edx/feanil/one_down 
Remove This awful code
 2015-12-04 12:57:05 -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
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
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Brian Beggs
0954bd0928 Migrations will now run during Acceptance tests 2015-11-25 12:57:02 -05:00
Clinton Blackburn
92153752c0 Rewrote Credit API 
- API built atop Django REST Framework
- Added support for OAuth 2.0 and session authentication
- Added permissions around eligibility data

ECOM-2609
 2015-11-24 22:06:54 -05:00
Peter Fogg
5043b46525 Merge pull request #10602 from edx/peter-fogg/update-footer-config 
Update LMS footer links.
 2015-11-24 15:50:46 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Usman Khalid
dc7b57f459 Cleanup some settings. 2015-11-20 18:18:32 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Peter Fogg
c5fac6ce68 Update LMS footer links. 
SWAT-92
 2015-11-13 10:08:10 -05:00
Muhammad Ammar
bfb69e560d fix DRF format query param issue 
TNL-3787
 2015-11-13 20:06:59 +05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
Ned Batchelder
0eea9ad48b Disable wiki notifications 
This is an expedient fix to a problem with migrations during the Django
1.8 upgrade.
 2015-11-12 15:28:54 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Nimisha Asthagiri
a40d2b65d2 Course Blocks App MA-1556 2015-11-05 14:41:40 -05:00
David Baumgold
792c3d93c1 Remove legacy MITX_FEATURES reference 2015-11-03 15:37:41 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
David Baumgold
b921d995fc Fixed an incorrect revert 
When I reverted the edx.org theme in 116ca29189,
I reverted this line incorrectly. It should be like this.
 2015-11-02 16:16:36 -05:00
Nimisha Asthagiri
3ac14fe3dd Merge pull request #10365 from edx/mobile/block-cache-framework 
Block Cache framework (MA-1551)
 2015-10-30 17:01:23 -04:00
Nimisha Asthagiri
7f325aee73 Block Cache framework. 2015-10-30 14:24:57 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Christina Roberts
55d1fb989e Merge pull request #10333 from edx/christina/delete-time-reference 
time.coffee no longer exists
 2015-10-29 12:41:12 -04:00
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit 
Remove circuit djangoapp from LMS
 2015-10-29 11:15:15 -04:00
Peter Fogg
d9751a855a Merge pull request #10404 from edx/feature/self-paced 
Enable self-paced courses.
 2015-10-28 20:46:35 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Peter Fogg
0107525d41 Enable self-paced courses behind a feature flag. 2015-10-28 14:33:11 -04:00
Calen Pennington
49f9e31a00 Allow auto_auth on the LMS in bok_choy tests 2015-10-28 14:33:11 -04:00
stv
d77f31dd38 Remove circuit djangoapp from LMS 
These endpoints (`edit_circuit` and `save_circuit`) had already been
commented out of `urls.py`, so these views were disabled.
 2015-10-26 15:50:29 -07:00
jsa
1bb29289f2 Programs: added platform support package and configuration model. 
ECOM-2657
 2015-10-25 21:30:26 -04:00
Clinton Blackburn
7c6a30f16d Failing startup if private settings fail to load 
Squashing private settings import errors leads to wasted developer time when developers expect settings to be in place, and they aren't. This change only loads private settings if the private.py file exists. If there is an error during the import of that file, the application will not start.

ECOM-2653
 2015-10-24 17:22:16 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
cahrens
28a3f46d90 time.coffee no longer exists 2015-10-23 14:01:06 -04:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Renzo Lucioni
fda61b52aa Reserve ecommerce worker username 
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
 2015-10-21 15:27:50 -04:00
Christina Roberts
a48d3ebe84 Merge pull request #10272 from edx/christina/PLAT-878 
Delete dead reference to modules.css.
 2015-10-21 14:26:07 -04:00
AlasdairSwan
c622f03a6a Merge pull request #10288 from edx/release 
Release 2015-10-21
 2015-10-21 13:16:35 -04:00
wajeeha-khalid
017477a8d7 MA-1281 User Account: added account_privacy field in GET and PATCH 2015-10-21 11:33:38 +05:00
cahrens
6d7ab6e868 Delete dead reference to modules.css. 
PLAT-878
 2015-10-20 14:26:55 -04:00
AlasdairSwan
bb5b1000e1 Revert "Reserve ecommerce service username on edx-platform." 
Bad data migration: assumes the email address being used is unique
This reverts commit 448f4d51e6.
 2015-10-19 15:19:09 -04:00
Justin Abrahms
7bf8e2d6c0 Allow uploads from GITHUB_REPO_ROOT 
This is necessary for course imports to not throw a SuspiciousOperation
error.
 2015-10-15 09:48:00 -07:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00