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

17222 Commits

Author SHA1 Message Date
Alex Dusenbery
b35450decc EDUCATOR-1729 | Control forum notifications with SiteConfiguration, too. 2017-11-14 12:59:46 -05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes 
Changes necessary for Django 1.11 tests to start
 2017-11-14 12:19:21 -05:00
sanfordstudent
4d0ce28fa9 Merge pull request #16560 from edx/sstudent/EDUCATOR-1624 
EDUCATOR-1624 logging
 2017-11-14 11:20:42 -05:00
Brian Mesick
7ccc498800 Merge pull request #16561 from edx/bmedx/django111_select_related 
Remove use of non-relational fields in select_related queries
 2017-11-14 11:04:41 -05:00
bmedx
09e5156543 Remove use of non-relational fields in select_related queries 
These changes should not change the actual queries at all, and those
will throw errors in Django 1.11.
 2017-11-14 10:10:08 -05:00
Sanford Student
898129b5c0 EDUCATOR-1624 logging 2017-11-14 10:07:24 -05:00
Clinton Blackburn
3a005c492f Disabled anonymous access for tabs that require enrollment 2017-11-14 08:00:16 -05:00
Troy Sankey
73318eccf7 Merge pull request #16526 from edx/pwnage101/teams_mgmt_commands 
teams and student management commands cleanup for django 1.11
 2017-11-13 18:11:56 -05:00
bmedx
d3bbb86fe3 Shims to fix test collection errors 2017-11-13 15:45:34 -05:00
bmedx
f3f8d8ec96 Changes necessary for Django 1.11 tests to start 
- Certificates management commands updates
- Moving reverse calls in tests into setUp from class definition
- Import shuffling
- Consolidating cryptograhpy version to 1.9
 2017-11-13 15:45:32 -05:00
Alex Dusenbery
8eb1900299 EDUCATOR-1571 | Send discussion notification on first response; add a CourseWaffleFlag for discussion notifications. 2017-11-13 10:45:45 -05:00
Adeel Khan
3f61f50de0 Adds error handling for password reset 
This patch enables handling of UserAPIInternalError on password
reset , instead of throwing 500 to user. We are showing user
a message if UserAPIInternalError is raised.

LEARNER-2571
 2017-11-10 14:41:15 +05:00
Troy Sankey
877c9fafc3 teams management commands cleanup for django 1.11 2017-11-09 15:39:04 -05:00
Troy Sankey
b07402e751 remove unused optparse imports 2017-11-09 15:38:54 -05:00
Matt Tuchfarber
5ca2ea9aad Merge pull request #16523 from edx/tuchfarber/program_marketing_tweaks 
Make FAQ responses allow HTML and fix banner image sizing.
 2017-11-09 15:29:08 -05:00
Marco Morales
9fc58a25bd Merge pull request #16506 from edx/hrein/responsive-experience/cleanups 
Styling changes for responsive behavior on LMS.
 2017-11-09 14:47:28 -05:00
Matt Tuchfarber
8828fa5cd9 Make FAQ responses allow HTML and fix banner image sizing. 2017-11-09 13:35:41 -05:00
Harry Rein
aa853a930e Styling changes for responsive behavior on LMS. 2017-11-09 12:46:48 -05:00
sanfordstudent
c02fd79fe2 Merge pull request #16481 from edx/sstudent/google_analytics_pixel 
EDUCATOR-1578: GA tracking pixel
 2017-11-09 11:48:39 -05:00
Sanford Student
e932fc9353 EDUCATOR-1578: GA tracking pixel 2017-11-09 10:54:58 -05:00
John Eskew
004da0c381 Merge pull request #16449 from edx/jeskew/commerce_to_appconfig 
Add commerce AppConfig and use to register signals.
 2017-11-09 10:25:16 -05:00
Alex Dusenbery
95b47369c4 PLAT-1786 | Add lms/cms analytics_exporter.py settings files. 2017-11-09 10:14:30 -05:00
Uman Shahzad
80cf046dc4 Merge pull request #16492 from edx/uman/responsive-registration-page-issues 
[ENT-749] Fix logistration page issues in Enterprise context (plus a color fix to validation)
 2017-11-09 19:50:13 +05:00
John Eskew
e30de61e23 Merge pull request #16507 from edx/jeskew/more_apps_signals 
Move ccxcon, credit, and programs Django apps to AppConfig standard.
 2017-11-09 09:26:38 -05:00
John Eskew
80d70f6ecb Run all touched files through isort. 2017-11-09 09:25:19 -05:00
John Eskew
6672f64188 Add commerce AppConfig and use to register signals. Move imports. 
Add explicit 'lms.djangoapps' prefix to all commerce imports, as another
commerce Django app exists at openedx.core.djangoapps.commerce
 2017-11-09 09:24:37 -05:00
Eric Fischer
c37ce9b730 Merge pull request #16504 from edx/efischer/EDU-1557 
Move hint before content it refers to
 2017-11-09 08:25:20 -05:00
Ayub khan
55cc8c6105 Merge pull request #16514 from edx/update_translations 
Update translations (autogenerated message)
 2017-11-09 17:03:53 +05:00
ayub-khan
47a6e73b5a Update translations (autogenerated message) 2017-11-09 15:59:53 +05:00
Muzaffar yousaf
690ddceb83 Merge pull request #16489 from edx/revert-16479-revert-16201-transcript-secure-credentials 
Revert "Revert "Transcript secure credentials""
 2017-11-09 15:57:36 +05:00
Waheed Ahmed
50891f9102 Implement program listing fragment for mobile app. 
Converted the program listing logic into a web fragment view
and exposed a URL for mobile app.

LEARNER-2980
 2017-11-09 12:51:25 +05:00
John Eskew
09bd0244b4 Move ccxcon, credit, and programs Django apps to AppConfig standard. 2017-11-08 17:06:09 -05:00
Troy Sankey
319aa8775a Merge pull request #16487 from edx/pwnage101/courseware_mgmt_cleanup 
courseware management commands cleanup for django 1.11
 2017-11-08 16:40:49 -05:00
Eric Fischer
8838f11cd2 Move hint before content it refers to 
EDUCATOR-1557
 2017-11-08 16:13:11 -05:00
Clinton Blackburn
f1f5a7ddb3 Disabled edx-notes for anonymous users 2017-11-08 15:41:02 -05:00
Troy Sankey
150096e3bf courseware management commands cleanup for django 1.11 2017-11-08 15:12:52 -05:00
John Eskew
7c94131e51 Merge pull request #16494 from edx/jeskew/remove_autostartup_call_code 
Remove everything from CMS/LMS startup.py except single monkey-patch.
 2017-11-08 14:03:26 -05:00
Albert (AJ) St. Aubin
43d6cc209b Merge pull request #16359 from edx/aj/LEARNER-2661 
Added Entitlement API
 2017-11-08 12:25:58 -05:00
Robert Raposa
f835fc8c1f Merge pull request #15476 from open-craft/mtyaka/homepage-course-max-site-config 
Ability to set HOMEPAGE_COURSE_MAX via SiteConfiguration.
 2017-11-08 12:21:14 -05:00
Brian Mesick
d552dea16e Merge pull request #16464 from edx/bmedx/django111_urls_lms_3 
LMS urls cleanup for Django 1.11 part 3
 2017-11-08 11:26:57 -05:00
Brian Mesick
2acdaa5de3 Merge pull request #16450 from edx/bmedx/django111_urls_lms_1 
LMS urls cleanup for Django 1.11
 2017-11-08 11:26:15 -05:00
John Eskew
0279181624 Remove everything from CMS/LMS startup.py except single monkey-patch. 
Move mimetype addition to common initialization.
 2017-11-08 11:26:07 -05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
Uman Shahzad
c849e16253 Fix color used for successful live registration validation. 2017-11-08 20:36:38 +05:00
Uman Shahzad
e966772633 Remove/fix margins for logistration page with enterprise context. 2017-11-08 20:36:38 +05:00
Albert St. Aubin
113e0af104 Added Entitlement API 
The Entitlement API will allow for GET, POST, DELETE(Revoke), and
variations of these methods of managing and retrieving data about
Learner Entitlements.
[LEARNER-2661]
 2017-11-08 10:03:38 -05:00
Matjaz Gregoric
9566b7a5f6 Ability to set HOMEPAGE_COURSE_MAX via SiteConfiguration. 
The setting controls the number of courses displayed on the homepage.
 2017-11-08 15:57:32 +01:00
Jeremy Bowman
5b415b5c7c Merge pull request #16486 from edx/jmbowman/remove_nose_cruft 
Remove unused nose settings and plugin
 2017-11-07 17:51:13 -05:00
Anthony Mangano
f696c4c08b Merge pull request #16440 from edx/LEARNER-2921-fix-spanish-cert-dates 
LEARNER-2921 Fix i18n for certificates
 2017-11-07 16:40:10 -05:00
Jeremy Bowman
0f4e4e1c31 Remove unused nose settings and plugin 2017-11-07 16:34:59 -05:00