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

13534 Commits

Author SHA1 Message Date
Waheed Ahmed
178f5a6056 Fixed the other half of forgot password flow accourding to logistration. 
ECOM-2947
 2016-03-08 12:14:24 +05:00
Hassan
fb2998172d Merge pull request #11660 from edx/hassan/dump-course-ids-fix 
Include CCX courses in dump_course_ids.
 2016-03-08 01:45:06 +05:00
Michael Frey
5dcdf9a46b Merge pull request #11755 from edx/SOL-1690 
Redirect to otto checkout for prof ed courses if enabled
 2016-03-07 15:09:23 -05:00
clrux
4f5290e464 Merge pull request #11764 from edx/clrux/ac-328-lessening-specificity 
Lessening specificity for headings
 2016-03-07 14:30:37 -05:00
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
Christina Roberts
e1889fb85e Merge pull request #11763 from edx/christina/remove-unnecessary-escaping 
The escaping is unnecessary and confusing to the user.
 2016-03-07 13:58:58 -05:00
Chris Rodriguez
08937ce5a8 Lessening specificity for headings 2016-03-07 13:07:56 -05:00
clrux
40b5f8e607 Merge pull request #11761 from edx/clrux/ac-328-removing-importants 
Removing importants from heading styles
 2016-03-07 12:11:11 -05:00
cahrens
2eabaccb33 The escaping is unnecessary and confusing to the user. 2016-03-07 11:58:22 -05:00
Chris Rodriguez
fed1d4b455 Removing importants from heading styles 2016-03-07 10:48:56 -05:00
Hassan
48a5b954d5 Use CourseOverview for dump_course_ids 2016-03-07 19:44:38 +05:00
Christina Roberts
dbc2b4161e Merge pull request #11752 from edx/christina/remove-hinter 
Delete hinter manager.
 2016-03-07 09:35:56 -05:00
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule. 
TNL-4195
 2016-03-04 15:34:48 -05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe 
Invalid display courseware through the LTI iframe in IE 10+
 2016-03-04 15:29:42 -05:00
Robert Raposa
674f8eab8e Merge pull request #11638 from edx/robrap/markup 
Use markup HTML helper with Text
 2016-03-04 12:32:00 -05:00
John Eskew
561950aafc Merge pull request #11717 from edx/jeskew/django_upgrade_1_8_10 
Going head with the bump to Django version 1.8.10 - hopefully, 1.8.11 will show up soon and we'll be able to remove this monkeypatch.
 2016-03-04 10:57:20 -05:00
Robert Raposa
8e1e4a4715 Use markup HTML helper with Text 
TNL-4160
 2016-03-04 10:44:41 -05:00
Ned Batchelder
b785690619 Merge pull request #11739 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-03-03 22:07:25 -05:00
Kevin Falcone
e64a107218 Merge pull request #11745 from edx/jibsheet/ensure-student_module_history-is-indexed 
Despite db_index=True, Django didn't generate an index
 2016-03-03 21:48:38 -05:00
John Eskew
ccb07f1c49 Monkey patch django.utils.http.is_safe_url for Django 1.8.10. 2016-03-03 16:53:42 -05:00
Kevin Falcone
3195a5c3fb Merge pull request #11722 from edx/jibsheet/remove-hardcoded-ATOMIC_REQUESTS 
This should not be needed, we specify ATOMIC_REQUESTS on each DB
 2016-03-03 16:05:31 -05:00
Kevin Falcone
304fb68076 Despite db_index=True, Django didn't generate an index 
student_module_id is the primary way into this table, not having an
index is disastrous with real data.
 2016-03-03 15:27:21 -05:00
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release 
Release ⇒ master
 2016-03-03 14:51:29 -05:00
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00:00
Simon Chen
b47a6d592f ECOM-3415 make sure all the xseries programs associated with a course is displayed 2016-03-03 08:42:14 -05:00
Dmitry Viskov
ca82f143b0 When using in-frame LTI navigation in IE 10 & 11, problems are not rendering properly. 
The problems render properly in IE 10 & 11 when using edX directly, or when opening LTI in a new tab.
This is reproducible in Canvas and D2L
 2016-03-03 12:27:21 +03:00
Awais Jibran
d46ea873d0 Merge pull request #11656 from attiyaIshaque/ai/tnl3848-list-index-out-of-range 
Fix list index out of range in Textbook's chapters.
 2016-03-03 11:41:49 +05:00
David Ormsbee
19d9920b9f Revert "Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops" 
This reverts commit acf6c1d609, reversing
changes made to c59db6e5fc.
 2016-03-02 13:15:17 -05:00
cahrens
3a06534241 Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used.
 2016-03-02 11:49:33 -05:00
Brian Beggs
bfdd1883f2 Merge pull request #11546 from mitocw/feature/aq/allow_staff_view_coach_dashboard_mitocw#125 
Allowed staff/admin of course to view ccx coach dashboard
 2016-03-02 09:01:36 -05:00
Attiya Ishaque
99e717fb11 Fix list index out of range in Textbook's chapters. TNL-3848 2016-03-02 10:30:44 +05:00
John Eskew
2ab54f315a Merge pull request #11669 from edx/jeskew/fix_django19_warnings 
Add app_label to models to prevent Django1.9 warnings.
 2016-03-01 17:19:55 -05:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion 
WIP: Lots of Python unittest speedups
 2016-03-01 16:50:27 -05:00
Ayub khan
be7be407cb Merge pull request #11478 from Ayub-Khan/ayubkhan/ECOM-3603 
Fixed progress exception for credit courses
 2016-03-02 01:10:17 +05:00
Renzo Lucioni
b02d1c1205 Merge pull request #11721 from edx/renzo/comment-client-test-speedup 
Speed up comment client tests
 2016-03-01 14:51:02 -05:00
Renzo Lucioni
1f0e61baa9 Speed up comment client tests 
Also accelerates forums UnicodeTestCases
 2016-03-01 14:41:52 -05:00
Kevin Falcone
a561367515 This should not be needed, we specify ATOMIC_REQUESTS on each DB 
There is one DB where we do not want it specified since transactions
on the CSMHE table when we aren't atomic across databases isn't a win.
 2016-03-01 14:00:13 -05:00
Kevin Falcone
327cdafccf Merge pull request #11715 from edx/jibsheet/aws_migrate-ignore-read-replica 
Don't hardcode student_module_history
 2016-03-01 13:12:54 -05:00
John Eskew
7bde238b3f Merge pull request #11711 from edx/jeskew/more_unittest_speedup 
Use SharedModuleStoreTestCase in the courseware navigation tests for speedup.
 2016-03-01 12:50:53 -05:00
Renzo Lucioni
cd84a9e77e Merge pull request #11714 from edx/renzo/sysadmin-xml 
Whittling away at XML modulestore code
 2016-03-01 12:47:00 -05:00
Bill DeRusha
95007a83b1 Merge pull request #11713 from edx/bderusha/git-add-speedup 
Add SharedModuleTestCase to git_import tests
 2016-03-01 12:13:51 -05:00
Kevin Falcone
72b4cf377b Don't hardcode student_module_history 
aws_migrate may be used on boxes where that DB does not yet exist.
 2016-03-01 11:56:11 -05:00
John Eskew
72ce55c8a2 Convert to SharedModuleStoreTestCase 2016-03-01 11:09:18 -05:00
Renzo Lucioni
32a29f4f26 Convert SysadminBaseTestCase to SharedModuleStoreTestCase 2016-03-01 11:02:01 -05:00
John Eskew
f6cdcdf52c Remove sysadmin feature to import course from git into XML modulestore. 2016-03-01 11:00:25 -05:00
Bill DeRusha
d8404ba477 Add SharedModuleTestCase to git_import tests 2016-03-01 10:54:54 -05:00
Bill DeRusha
8b28790050 Merge pull request #11699 from edx/bderusha/django-bug-fix-mp 
Monkey patch django.db.models.options for faster cache expiry
 2016-03-01 09:25:01 -05:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl 
AC-328 adding UXPL classnames to headings
 2016-03-01 07:23:07 -05:00
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager 
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
 2016-02-29 18:02:57 -05:00
Bill DeRusha
bec6971ae2 Monkey patch django.db.models.options for faster cache expiry 2016-02-29 17:37:17 -05:00