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

2274 Commits

Author SHA1 Message Date
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Diana Huang
f00841d38e Be specific about JS files for cms-squire. 2016-02-02 17:16:31 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
J. Cliff Dyer
90493ac3a2 Track push notification activity in analytics 
When a course is updated, track whether or not a push notification is
sent.
 2016-01-27 20:33:21 +00:00
Toby Lawrence
944725e35b Adding optimized images in batches [01/19] 2016-01-13 20:37:48 -05:00
Toby Lawrence
451b0a9c66 Revert "Crush down images." 
This reverts commit 8402be3b20.
 2016-01-13 19:12:13 -05:00
Toby Lawrence
8402be3b20 Crush down images. 
Ran these suckers through ImageOptim, which crunched 'em down real nice.
 2016-01-13 18:29:00 -05:00
Calen Pennington
9265dc007c Shrink images using trimage 
cms/static/images/bg-micro-stripes.png              | Bin 117 -> 102 bytes
 cms/static/images/choice-example.png                | Bin 2751 -> 1544 bytes
 cms/static/images/drag-handles.png                  | Bin 954 -> 103 bytes
 cms/static/images/explanation-example.png           | Bin 4772 -> 4671 bytes
 cms/static/images/header-example.png                | Bin 6639 -> 385 bytes
 cms/static/images/hiw-feature1.png                  | Bin 67031 -> 66798 bytes
 cms/static/images/hiw-feature2.png                  | Bin 17027 -> 16408 bytes
 cms/static/images/hiw-feature3.png                  | Bin 15092 -> 14775 bytes
 cms/static/images/large-video-icon.png              | Bin 234 -> 128 bytes
 cms/static/images/multi-example.png                 | Bin 2875 -> 1519 bytes
 cms/static/images/number-example.png                | Bin 1430 -> 515 bytes
 cms/static/images/preview-lms-staticpages.png       | Bin 61450 -> 53417 bytes
 cms/static/images/problem-editor-icons.png          | Bin 2307 -> 2304 bytes
 cms/static/images/search-icon.png                   | Bin 1196 -> 423 bytes
 cms/static/images/select-example.png                | Bin 1961 -> 1006 bytes
 cms/static/images/string-example.png                | Bin 1458 -> 574 bytes
 cms/static/images/studio-logo.png                   | Bin 4243 -> 885 bytes
 cms/static/images/thumb-hiw-feature1.png            | Bin 16516 -> 16311 bytes
 cms/static/images/thumb-hiw-feature2.png            | Bin 12956 -> 12821 bytes
 cms/static/images/thumb-hiw-feature3.png            | Bin 16616 -> 16395 bytes
 common/static/css/vendor/ova/video-js.fw.png        | Bin 78899 -> 74914 bytes
 .../css/vendor/pdfjs/images/loading-small.png       | Bin 7402 -> 613 bytes
 .../css/vendor/pdfjs/images/loading-small@2x.png    | Bin 16131 -> 1324 bytes
 .../secondaryToolbarButton-documentProperties.png   | Bin 403 -> 402 bytes
 .../css/vendor/slickgrid/images/drag-handle.png     | Bin 1130 -> 94 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:32 -05:00
asadiqbal
7f38c1a3c9 WL-270 used gettext in javascript files 2016-01-07 18:08:15 +05:00
AlasdairSwan
f25d8a16ee ECOM-3319 loading edx-icons fonts in studio programming author tool 2016-01-06 12:08:47 -05:00
Syed Hasan raza
6a24fd66cc Merge pull request #11005 from edx/shr/bug/TNL-2622-course_import_status_message_fix_test 
Shr/bug/tnl 2622 course import status message fix test
 2016-01-04 12:33:45 +05:00
Syed Hasan raza
482e0e457f Merge pull request #10978 from edx/shr/bug/TNL-3809-Sign-in-mutiple-clicks 
Shr/bug/tnl-3809-sign-in-mutiple-clicks
 2016-01-04 12:32:45 +05:00
Syed Hassan Raza
912e012bb7 Add Disabled class to Sign In button 2015-12-31 15:21:29 +05:00
Syed Hassan Raza
fe0740b91e set path explicitly for storing cookie 2015-12-31 15:19:40 +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
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -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
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
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
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
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
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
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
Jillian Vogel
b7f0836be8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	AUTHORS
 2015-12-04 11:26:55 +10:30
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -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
Frances Botsford
287304c714 visual cleanup to view and edit certificates page in studio 2015-12-01 16:36:18 -05:00
Zia Fazal
46150800c0 Merge pull request #10737 from edx/ziafazal/SOL-1433 
SOL-1433:remove audit course mode
 2015-11-26 13:46:33 +05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Zia Fazal
aa529fe0b6 remove audit course mode 
removed print statement
 2015-11-25 17:58:30 +05:00
asadiqbal
88ae4ce257 SOL-1416 2015-11-18 11:56:49 +05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Andy Armstrong
a3ff4d50e8 Merge pull request #10534 from edx/andya/fix-studio-videos 
Fix optimizing of draggabilly and json2
 2015-11-06 12:12:44 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
asadiqbal
13508c7681 SOL-1379 2015-11-06 18:45:36 +05:00
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly 
Upgrade draggabilly.js to fix Firefox iframe bug
 2015-11-05 11:01:35 -05:00