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

6505 Commits

Author SHA1 Message Date
Ben Patterson
d460eb62a9 Merge pull request #11075 from edx/benp/fix-flaky-hello 
Fix flaky condition.
 2015-12-28 13:34:58 -05:00
Ben Patterson
056158d72b Fix flaky condition in lettuce test. 2015-12-28 10:50:45 -05:00
Ben Patterson
d522068265 Fix flaky condition. TNL-3937. 2015-12-26 19:42:59 -05:00
Usman Khalid
766c3dca71 Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 
Fix escaping in studio editor
 2015-12-23 14:57:50 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Ibrahim Ahmed
5832b579be Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment 
Ibrahimahmed443/sol 1479 change time allotment
 2015-12-21 21:55:30 +05:00
ibrahimahmed443
f3d43ab5db SOL-1479 set max time limit to 99:59 hours; add jasmine tests to validate time limit 2015-12-21 19:30:49 +05:00
Ayub-Khan
2f6b1f9b84 -new code according to document. 2015-12-21 11:56:50 +05:00
Ayub-Khan
a6fd6ca5ec fix html escape error 
TNL-3822
 2015-12-18 16:02:29 +05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156 
leanModal fixes
 2015-12-17 15:17:51 -05:00
Bill DeRusha
e63f0f922c Merge pull request #10984 from edx/bderusha/studio-audit-cert 
Disable certificate template creation for audit only courses
 2015-12-17 14:53:40 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Bill DeRusha
08d1268c28 Disable cert generation for audit only courses 2015-12-17 13:23:38 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +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
muzaffaryousaf
7413484b8d Resolving the moment.js issues 
TNL-1958
 2015-12-17 22:07:33 +05:00
Diana Huang
ba526f4f39 Merge pull request #11008 from edx/release 
Release
 2015-12-16 12:05:20 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire 
Delete dead SUBDOMAIN_BRANDING setting.
 2015-12-16 11:09:12 -05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -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
83f7ffd743 Revert "set path explicitly for storing cookie" 2015-12-15 13:26:51 -05:00
Sven Marnach
d35effc8d2 Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. 2015-12-15 13:58:06 +01: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
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
Zia Fazal
772a4d4ba1 org help text updated 2015-12-14 12:39:44 +05:00
Sarina Canelake
21e4c90c3f Keep 'peergrading' and 'combinedopenended' defined as deprecated 2015-12-11 16:16:08 -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
c6c5230941 Create sample deprecated blocks for bok choy tests 2015-12-11 15:07:12 -05:00
Sarina Canelake
27cb3080c2 Remove final CMS references to 'peergrading' and 'combinedopenended' 2015-12-11 15:07:10 -05:00
Sarina Canelake
dcf4a15124 Remove CMS ORA1 templates 2015-12-11 15:07:06 -05:00
Sarina Canelake
c450145f7b Update CMS Contentstore tests to not use ORA1 examples 2015-12-11 15:05:01 -05:00
Sarina Canelake
f691b7b664 Remove all references to open_ended and s3 interfaces (ORA1) 2015-12-11 15:05:00 -05:00
Sarina Canelake
d887c0fef1 Remove 'open_ended_grading' djangoapp & URLs (ORA1) 2015-12-11 15:04:59 -05:00
Sarina Canelake
ade863e994 Remove CMS Course Checklists feature 2015-12-11 10:32:14 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete 
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
 2015-12-11 18:39:55 +05:00
Feanil Patel
e2b02137a5 Merge pull request #10927 from edx/feanil/fix_delete_command 
Fix the delete course management command.
 2015-12-10 12:24:05 -05:00
Feanil Patel
a4006c8604 Add another test and fix existing tests. 2015-12-10 11:12:53 -05:00
Ned Batchelder
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things 
Add autospec to more mocks
 2015-12-10 09:47:28 -05:00
Feanil Patel
07f015bb57 Fix the management command. 2015-12-10 08:29:33 -05:00
Christina Roberts
ef4f39fea5 Merge pull request #10788 from simbs/mariana/remove-force-round-time 
Release/due times no longer round to half hours.
 2015-12-09 10:11:38 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Sarina Canelake
bc822b7f93 Merge pull request #10873 from edx/kill-callstackmanager 
Remove CallStackManager (PLAT-931)
 2015-12-08 20:46:21 -05:00
Mariana
34faf1b1ab Release/due times no longer round to half hours. 
Changed 'forceRoundTime' to 'false' in BaseDateEditor
Updated bok choy acceptance test 'studio.test_studio_outline.py:EditingSectionsTest.test_can_edit_subsections' to check times aren't rounded to the nearest half hour after saving

Also added myself to AUTHORS
 2015-12-08 19:30:43 +00:00
Renzo Lucioni
3c01ed44d0 Include auth URL data attribute in the programs authoring template 
The authoring app requests JWTs from this endpoint.
 2015-12-08 13:33:20 -05:00
Sarina Canelake
8928e9ef19 Remove CallStackManager (PLAT-931) 2015-12-08 10:21:55 -05:00
jsa
2fbfcfd2ff Implement an endpoint to get id_tokens for programs. 
ECOM-2440
 2015-12-07 12:52:00 -05:00