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

21968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Alison Hodges
0752b008bb Merge pull request #2976 from edx/ahodges/documentation/hackathon 
Instructor dash changes for DOC-231, resequencing for DOC-230
 2014-03-19 11:03:55 -04:00
Alison Hodges
ba67e59ead Instructor dash changes for DOC-231, resequencing for DOC-230, and fixed display of notes 2014-03-19 11:02:55 -04:00
Usman Khalid
8b6e3b4422 Replaces print statement in django_comment_client with unicode log.debug. 
LMS-2194
 2014-03-19 19:36:55 +05:00
Anton Stupak
f1a34256ad Merge pull request #2965 from edx/anton/update-acceptance-test 
Video: update acceptance test.
 2014-03-19 16:27:04 +02:00
Waheed Ahmed
78e31cf39d Merge pull request #2984 from edx/waheed/lms2307-fix-lagacy-dash-ugettext-imported-as-u 
Fixed "ugettext" is imported as "_u" in lagacy dash.
 2014-03-19 19:12:55 +05:00
Waheed Ahmed
5fccc46bfb Fixed "ugettext" is imported as "_u" in lagacy dash. 
LMS-2307
 2014-03-19 18:19:15 +05:00
Mark Hoeber
a0289b06cb Merge pull request #2961 from edx/markhoeber/documentation/release-notes-3-18-14 
Release Notes for 3-18-14
 2014-03-19 09:13:27 -04:00
Will Daly
1287268cb7 Update XBlock to latest version 2014-03-19 07:45:45 -04:00
Will Daly
1add868b59 Merge pull request #2971 from antoviaque/mentoring-noworkbench 
mentoring-noworkbench: Remove import of workbench module (moved to SDK)
 2014-03-19 07:44:10 -04:00
polesye
14b1266e06 Fix flaky acceptance test. 2014-03-19 13:06:10 +02:00
Anton Stupak
5a399e21c2 Merge pull request #2982 from edx/anton/fix-acceptance-test 
Video: Fix flaky acceptance test.
 2014-03-19 12:19:06 +02:00
polesye
59ca4774fb Fix flaky acceptance test. 2014-03-19 11:11:17 +02:00
Frances Botsford
d685baf478 added loading pattern to studio 2014-03-18 17:11:51 -04:00
Jay Zoldak
4fc71c1d64 Merge pull request #2977 from edx/zoldak/kill-perfstats 
Kill the perfstats module, which is unused
 2014-03-18 16:55:48 -04:00
Sarina Canelake
136f4388bf Merge pull request #2941 from edx/sarina/lms-1287 
Sarina/lms 1287
 2014-03-18 16:54:45 -04:00
David Baumgold
ac4caf0b59 Merge pull request #2969 from edx/db/fix-mkdir-error 
Mongo modulestore: create data dir
 2014-03-18 16:52:35 -04:00
David Baumgold
31b64ad54e Merge pull request #2933 from edx/cale/quieter-i18n-tests 
Make i18n tests quieter
 2014-03-18 16:51:42 -04:00