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

21988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget 
LMS-2262
 2014-03-24 12:16:41 -04:00
Nimisha Asthagiri
3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2 
Frances/feature/studio nav manipulation2
 2014-03-21 15:13:22 -04:00
Carson Gee
767feb9396 Merge pull request #2948 from carsongee/cg/cas_attribute_callback 
Adding ability to give an attribute callback for CAS
 2014-03-21 14:26:49 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio 
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
 2014-03-21 13:58:01 -04:00
Frances Botsford
91c0b8ee86 UX changes for course navigation manipulation 2014-03-21 13:18:31 -04:00
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions 
Catch module render exceptions
 2014-03-21 21:12:30 +05:00
Valera Rozuvan
52b1149541 Merge pull request #3016 from edx/valera/comment_out_some_more 
Commenting out flaky acceptance tests.
 2014-03-21 17:50:05 +02:00
Valera Rozuvan
8474336a3d Commenting out flaky acceptance tests. 2014-03-21 17:46:49 +02:00
David Baumgold
bba766252f Merge pull request #3015 from louyihua/master 
Fix a url processing error in 02_html5_video.js
 2014-03-21 11:44:18 -04:00
Valera Rozuvan
b54a268fba Merge pull request #3014 from edx/valera/comment_out_failing_acceptance_test 
Commenting out a flaky acceptance test.
 2014-03-21 17:24:34 +02:00
louyihua
ce1b62311b Fix a url processing error in 02_html5_video.js 
As the code in this .js will break the url's integrity when there is already a query string inside the video source's url and cause the url to be invalid in some cases (for example, when working with a url from Windows Azure's Media Service, the appended '?' will cause the url being invalid).
I modified the code by first checking whether the url has already had a query string, and if so, then use '&' instead of '?' to prevent the breaking, and it works for the url from Windows Azure's Media Service.
 2014-03-21 23:24:28 +08:00
Valera Rozuvan
bfee966cfe Commenting out a flaky acceptance test. 2014-03-21 16:51:44 +02:00
David Baumgold
c4b81111f2 Merge pull request #2963 from louyihua/master 
Fix incorrect parse of url in video_module.py
 2014-03-21 10:50:40 -04:00
louyihua
d76c3dfc36 Fix the url processing error when there is a query string inside the video source's url 
1. In video_module.py, rewrite the get_ext() function to use the built-in urlparse module to parse the input filename first and then get the file's extension name from the parsed path.
2. In test_video.py, add two test cases (one with query string while the other without) in order to test the rewritten get_ext() function.
 2014-03-21 22:47:00 +08:00
Valera Rozuvan
55b0fd08e7 Merge pull request #3011 from edx/valera/delete_old_files 
Removed unused code that is over 2 years old.
 2014-03-21 16:45:26 +02:00
frances botsford
32ea61857d Merge pull request #3007 from edx/frances/feature/ui-loading 
added loading pattern to studio
 2014-03-21 10:15:11 -04:00
zubair-arbi
5b3a08ddcc Merge pull request #2925 from edx/zub/bugfix/std1433-importunicodename 
use unicode strings for slug and regex
 2014-03-21 19:01:26 +05:00
Anton Stupak
4bbc470844 Merge pull request #2988 from edx/anton/fix-multiple-image-inputs 
Fix image mapped inputs.
 2014-03-21 14:03:54 +02:00
Anton Stupak
ce7e7740c4 Merge pull request #3001 from edx/anton/fix-flaky-acceptance-test 
Video: Fix flaky acceptance test.
 2014-03-21 14:03:45 +02:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment 
Simple email checking for batch enrollment on inst dash
 2014-03-21 07:45:09 -04:00
Valera Rozuvan
7e9ebb09a0 Removed unused code that is over 2 years old. 2014-03-21 13:29:51 +02:00
Usman Khalid
e914286ba2 Fixed email in authors.txt 2014-03-21 16:12:38 +05:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
polesye
f3f1aa2943 Fix acceptance test. 2014-03-21 10:46:50 +02:00
Dave St.Germain
05ea675f67 Merge pull request #2959 from edx/dcs/remove-junk-from-codemirror 
Removed circuit editor setup code that had always been in codemirror-compressed.js
 2014-03-20 16:45:19 -04:00
Sarina Canelake
066d04f595 Simple email checking for batch enrollment on inst dash 
LMS-2244
 2014-03-20 15:58:19 -04:00
Will Daly
b8ceb5ab7e Merge pull request #2983 from edx/will/update-xblock 
Update XBlock to latest version
 2014-03-20 14:57:15 -04:00
Dave St.Germain
376b040775 Removed circuit editor setup code that had always been in 
codemirror-compressed.js
 2014-03-20 14:33:32 -04:00
Dave St.Germain
3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header 
Remove course name from page H1, and slightly improve sequence navigation
 2014-03-20 14:07:32 -04:00
Jay Zoldak
b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8 
Fix pylint disable pragmas that were pep8 violations
 2014-03-20 13:56:00 -04:00
polesye
1f5ae87f60 BDL-810: Fix image mapped inputs. 2014-03-20 16:55:08 +02:00
Brian Talbot
385880d8ec Merge pull request #2989 from edx/talbs/fix-lms-contentbackground 
FIX - LMS: Courseware Content Background Color/Height in IE
 2014-03-20 10:38:15 -04:00
Anton Stupak
28d6d5678b Merge pull request #2996 from edx/anton/add-selecton-on-focus-for-time-editors 
Video: Add highlighting of start/end time field when clicking into it.
 2014-03-20 16:35:27 +02:00
Waheed Ahmed
817df15c47 Merge pull request #2967 from edx/waheed/lms2275-fix-html-tab-in-bulk-email-feature 
Fixed HTML tab in bulk email feature on firefox.
 2014-03-20 19:31:43 +05:00
Dave St.Germain
4385e71411 Merge pull request #2595 from edx/dcs/a11y-expose-errors-sq 
Answer checks should offer feedback to assistive tech. This commit adds
 2014-03-20 10:30:45 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds 
a page level javascript SR object to enable reading of alert messages.
LMS-2158
 2014-03-20 09:53:44 -04:00
Waheed Ahmed
d364a71e8f Fixed HTML tab in bulk email feature on firefox. 
LMS-2275
 2014-03-20 18:43:02 +05:00
Usman Khalid
021e6f5b45 Merge pull request #2970 from edx/usman/lms2194-discussion-forum-unicode-error 
Replaces print statement in django_comment_client with unicode log.debug.
 2014-03-20 17:36:57 +05:00
polesye
790d359b89 BLD-581: add highlighting of entire field on focus. 2014-03-20 13:40:11 +02:00
Waheed Ahmed
c8797ac204 Merge pull request #2966 from edx/waheed/lms2346-fix-assigning-forum-roles-beta-membership-tab 
Fixed assigning forum roles from beta dashboard membership.
 2014-03-20 16:24:59 +05:00
jmclaus
50a399a14a Merge pull request #2995 from edx/jmclaus/bugfix_remove_tooltip_from_captions 
Removed tooltip from captions. [BLD-629]
 2014-03-20 11:24:23 +01:00
jmclaus
f2489d141c Removed tooltip from captions. [BLD-629] 2014-03-20 10:24:27 +01:00
Waheed Ahmed
bb26fa0cd0 Fixed assigning forum roles from beta dashboard membership. 
LMS-2346
 2014-03-20 11:38:43 +05:00
Brian Talbot
8288ff5fdd resolves IE9 display issue where courseware content layout/background display was broken 
UX-53
 2014-03-19 15:14:43 -04:00
Alison Hodges
fbe95bfb5b Merge pull request #2980 from edx/ahodges/documentation/prettyprint 
Added pretty-printed JSON examples for DOC-168, fixed rst subheadings
 2014-03-19 14:45:47 -04:00
Alison Hodges
4f917a8914 Added pretty-printed JSON examples for DOC-168, fixed rst subheadings 2014-03-19 14:44:52 -04:00
Dave St.Germain
da79ae2b4d Merge pull request #2946 from edx/dcs/a11y-focus-hover 
Fixes LMS-2352 by unifying :hover and :focus styles.
 2014-03-19 14:39:54 -04:00
Valera Rozuvan
e4dff8e118 Merge pull request #2987 from edx/valera/add_timeout_china 
Valera/add timeout china
 2014-03-19 19:55:27 +02:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module. 
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
 2014-03-19 19:30:45 +02:00