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

12437 Commits

Author SHA1 Message Date
muhammad-ammar
fcbe595c8a Bookmarks List Pagination 
TNL-2490
 2015-12-17 22:07:34 +05:00
Usman Khalid
4304c66c54 Performance optimizations and cache to keep the bookmarks info updated. 
The cache uses the bookmarks.XBlockCache model.

TNL-1945
 2015-12-17 22:07:34 +05:00
cahrens
dbb5232681 Try changing how the viewer is dismissed. 2015-12-17 22:07:34 +05:00
muzaffaryousaf
7413484b8d Resolving the moment.js issues 
TNL-1958
 2015-12-17 22:07:33 +05:00
Muhammad Ammar
1e9907a8c8 Bookmark Events 
TNL-1944
 2015-12-17 22:07:33 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware. 
TNL-1957
 2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View 
TNL-1958
 2015-12-17 22:07:31 +05:00
muzaffaryousaf
1616de5051 Bookmarks API. 
TNL-2180
 2015-12-17 22:07:30 +05:00
Peter Fogg
283623ab35 Merge pull request #11019 from edx/peter-fogg/add-ungenerated-migrations 
Add autogenerated migrations due to field default changes.
 2015-12-17 11:55:55 -05:00
Bill DeRusha
d9f6f90c3d Merge pull request #11010 from edx/bderusha/auto-deadlines 
Fix auto set deadlines on publish
 2015-12-17 11:28:46 -05:00
Peter Fogg
24edef8998 Add ungenerated migrations due to field default changes. 2015-12-17 10:18:51 -05:00
wajeeha-khalid
e37f8ff767 Merge pull request #10905 from edx/jia/MA-1051 
MA-1051 - DiscussionAPI: Remove http errors from api.py
 2015-12-17 15:42:40 +05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool 
WIP for financial support tool.
 2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments. 
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
 2015-12-16 14:17:19 -05:00
Bill DeRusha
1846353a1f Fix auto set deadlines on publish 2015-12-16 13:58:13 -05:00
wajeeha-khalid
588833ff43 MA-1051: DiscussionAPI - Removed http errors from api.py and refactored to more specific errors 2015-12-16 21:23:51 +05:00
Diana Huang
043584eaee Merge pull request #10983 from edx/diana/markup-helpers 
Add new i18n markupsafe helper methods.
 2015-12-16 09:53:10 -05:00
raeeschachar
edd4781d41 Merge pull request #10975 from edx/raees/chrome-bok-choy-test-toggle-by-clicking-note 
Fixed toggle by clicking on the note failing on Chrome
 2015-12-16 18:38:13 +05:00
John Eskew
65ec853864 Merge pull request #10698 from edx/jeskew/TNL-3795_fix 
Protect against divide by zero in DataDog event.
 2015-12-15 16:34:28 -05:00
Diana Huang
fab7a071e3 Add new helper methods. 2015-12-15 16:21:14 -05:00
John Eskew
5382c86c1c Protect against divide by zero in DataDog event. 
Add test for zero total/max score in a problem.
 2015-12-15 15:10:57 -05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Jesse Zoldak
9e5eda0ab6 Merge pull request #10999 from edx/revert-10506-shr/bug/TNL-2622-course_import_status_message 
Revert "set path explicitly for storing cookie"
 2015-12-15 14:21:15 -05:00
Renzo Lucioni
c14548d15f Merge pull request #10963 from edx/renzo/remove-dead-code 
Remove dead code
 2015-12-15 14:11:51 -05:00
Jesse Zoldak
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
clrux
92fa4d07cd Merge pull request #10917 from edx/clrux/ac-190 
CMS: removing H1 and H2, adding H4, H5, and H6 to TinyMCE
 2015-12-15 11:36:30 -05:00
Chris Rodriguez
3baad89604 CMS: removing H1, adding H4, H5, and H6 to TinyMCE 2015-12-15 10:21:35 -05:00
Syed Hasan raza
920fc0e7de Merge pull request #10506 from edx/shr/bug/TNL-2622-course_import_status_message 
set path explicitly for storing cookie
 2015-12-15 16:44:58 +05:00
Renzo Lucioni
da16b3da22 Remove dead code 
Deletes unused code from an old implementation of microsites.
 2015-12-14 16:38:14 -05:00
Andy Armstrong
5b9e0e9dcf Merge pull request #10957 from edx/andya/studio-xblock-debugging 
Support local debugging of XBlock JavaScript
 2015-12-14 13:05:23 -05:00
clrux
a6e8383489 Merge pull request #10706 from edx/clrux/ac-188-no-draggabilly 
Video: Adding closed captioning to the video player (not draggable)
 2015-12-14 11:07:12 -05:00
Chris Rodriguez
b883d52722 Adding closed captions (not draggable) 2015-12-14 10:19:11 -05:00
John Eskew
0ed7903234 Merge pull request #10838 from edx/jeskew/standardize_mongo_connections 
All feedback above was addressed, the commits were squashed, and tests passed. Merging.
 2015-12-14 09:16:38 -05:00
Christine Lytwynec
e45ac60c9c Merge pull request #10928 from edx/clytwynec/problem-type-a11y-tests 
add AnnotationProblemTypeTest and SymbolicProblemTypeTest
 2015-12-14 08:38:42 -05:00
John Eskew
74e70119a2 Use a common MongoDB connection function. 
Add some missing @autoretry_read() decorators.
Change to PyMongo 3.x-compatible syntax.
 2015-12-14 07:42:38 -05:00
raeeschachar
f3b2e38a55 Fixed toggle by clicking on the note failing on Chrome 2015-12-14 13:40:42 +05:00
Matt Drayer
115b169259 mattdrayer/SOL-1519: Include course-level configuration in feature check 2015-12-13 09:57:29 -05:00
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1 
Remove ORA1: Main Pull Request
 2015-12-11 17:31:41 -05:00
Clinton Blackburn
2695e7b3cb Merge pull request #10965 from edx/clintonb/credit-followup 
Followup to Credit Patch
 2015-12-11 17:06:24 -05:00
Clinton Blackburn
27f853d605 Followup to Credit Patch 
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
 2015-12-11 15:53:18 -05:00
Andy Armstrong
cc24ca55e6 Support local debugging of XBlock JavaScript 
It turns out that loading JavaScript with $.getScript
causes Chrome to treat the file as an XHR request
and not JS. I've switched over to using RequireJS
to load the URL which already has the ability to
dynamically load files and have the browser
recognize them.
 2015-12-11 15:50:38 -05:00
Sarina Canelake
2b4a1be60f Comment out mock call to ORA1 stub server 2015-12-11 15:30:27 -05:00
Sarina Canelake
71a2a2a001 Remove ORA1 lettuce tests 2015-12-11 15:07:13 -05:00
Sarina Canelake
2e4bba0a79 Remove ORA1 test units from xmodule test courses 2015-12-11 15:07:12 -05:00
Sarina Canelake
6280ccdbcf Remove combined_open_ended XModule CSS (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
9d6ae576da Remove combined_open_ended XModule JS code (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
f689271639 Remove combined_open_ended XModule Python code (ORA1) 2015-12-11 15:07:10 -05:00
Sarina Canelake
2431baff8f Remove notification_image_for_tab logic (ORA1) 2015-12-11 15:07:08 -05:00
stv
0532b87a86 Remove ORA1 images 2015-12-11 15:07:07 -05:00
Sarina Canelake
a3c3c7aa66 fixup! Remove ORA1 common/ acceptance tests 2015-12-11 15:07:07 -05:00