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

6489 Commits

Author SHA1 Message Date
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
Syed Hassan Raza
36db063566 set path explicitly for storing cookie 2015-12-07 14:10:58 +05:00
Nimisha Asthagiri
7429a32ba8 Merge pull request #10799 from edx/mobile/course-api-fields-MA-1661 
Update Course About API to include effort and video (MA-1661)
 2015-12-04 17:17:21 -05:00
Nimisha Asthagiri
4a530690e1 Remove unused "has_cert_config" field on CourseDetails. 2015-12-04 16:03:06 -05:00
Nimisha Asthagiri
d6ced072c4 Refactor CourseDetails 2015-12-04 16:03:05 -05:00
frances botsford
e9a323405b Merge pull request #10609 from edx/frances/adjust-studio-cert-limits 
Add certificates signatory limit help text in Studio
 2015-12-04 13:14:28 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
Jillian Vogel
b7f0836be8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	AUTHORS
 2015-12-04 11:26:55 +10:30
Peter Fogg
068b439ada Merge pull request #10821 from edx/peter-fogg/fix-certs-tests 
Fix broken certificates-related tests.
 2015-12-03 18:00:16 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -05:00
Peter Fogg
1ba1c213d5 Fix broken certificates-related tests. 2015-12-03 16:30:05 -05:00
Jillian Vogel
6fd5ba5a69 MA-240 Added window beforeunload handler to the ActiveVideoUploadList view, 
which shows a notification if there are any "Queued" or "Uploading" videos still in progress.
 2015-12-04 07:38:22 +10:30
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Dan Powell
31646e4a72 Don't render unconfigured marketing links in CMS footer. 2015-12-03 13:41:53 -05:00
Renzo Lucioni
1cee9a0dcd Merge pull request #10714 from edx/renzo/programs-authoring-page 
Add a Studio view and template to host the Programs authoring app
 2015-12-03 12:12:23 -05:00
Renzo Lucioni
e2833d8fc6 Add a Studio view and template to host the Programs authoring app 
The Programs authoring app is a Backbone SPA maintained in a separate repository. The app handles its own routing and provides a UI which can be used to create and publish new Programs (e.g, XSeries). ECOM-2598.
 2015-12-03 10:47:12 -05:00