Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,732 Commits 1 Branch 0 Tags
76b9ecf4e1ce35d773f4e88309310030145936cd
Commit Graph

8061 Commits

Author SHA1 Message Date
Oleg Marshev
7966ca45bd Merge pull request #3384 from edx/oleg/fix-matlab-timeout 
Run Code infinite queueing fix. BLD-994.
 2014-04-25 11:09:53 +03:00
Oleg Marshev
0f70a997f5 Add timestamp and wait for 35 sec. 2014-04-25 10:26:46 +03:00
Waheed Ahmed
49ef8c5686 Added code to remove css on closing cheatsheet. 2014-04-25 11:35:52 +05:00
Jim Abramson
bf56d30355 Merge pull request #3458 from edx/jsa/user-profile-pagination-acceptance 
add acceptance tests for user profile pagination.
 2014-04-24 16:06:41 -04:00
cahrens
29d32d35ff Tests for raw editor and minor wording changes. 2014-04-24 14:18:13 -04:00
Mark Hoeber
abc6d49ce1 UI String Updates for Raw HTML Editor Change 
Modified the Raw HTML template text and the help string for the Editor
setting.
 2014-04-24 14:18:13 -04:00
Frances Botsford
4960026bc6 adjust codemirror window on raw HTML editor 2014-04-24 14:18:12 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor. 
STUD-1562
 2014-04-24 14:18:12 -04:00
Andy Armstrong
01fdc22323 Remove verify_html as it isn't supported in TinyMCE 4 2014-04-24 14:17:43 -04:00
Andy Armstrong
f4e4082b7d Make TinyMCE more tolerant about HTML elements 
STUD-1565
 2014-04-24 14:17:42 -04:00
jsa
f71e78b69f add acceptance tests for user profile pagination. 
JIRA: FOR-492
 2014-04-24 13:47:03 -04:00
Greg Price
909903eb9c Merge pull request #3391 from edx/gprice/user-profile-pagination 
Add pagination to forum user profile
 2014-04-24 13:34:53 -04:00
jmclaus
69ed95b482 Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. [BLD 981] 2014-04-24 09:37:26 -04:00
zubiar-arbi
7b5c647c8e properly remove users from instructor/staff groups on a course delete 
STUD-1555
 2014-04-24 17:11:19 +05:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Jay Zoldak
8da80b5e45 Merge pull request #3341 from edx/ammar/bok-choy-video-tests-batch2 
Convert video tests from lettuce to bok-choy - batch 2
 2014-04-23 16:15:24 -04:00
Greg Price
643069c64c Remove cruft from user profile threads 
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
 2014-04-23 16:07:36 -04:00
David Baumgold
6773105264 Merge pull request #3425 from edx/pk-set-can-be-none 
pk_set can be None
 2014-04-23 15:30:37 -04:00
Jay Zoldak
6e4a451f92 Reword docstrings for bok-choy video tests 2014-04-23 14:37:26 -04:00
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
David Baumgold
3b49c17c06 Merge pull request #3382 from TheJJ/patch-1 
fixed retry invokation for calling setState
 2014-04-23 13:34:33 -04:00
Valera Rozuvan
450dfe17b0 TESTS: Add tests for fix of end-time in the video player. 
BLD-662
 2014-04-23 18:44:10 +03:00
Valera Rozuvan
dc373f22b1 Merge pull request #3350 from edx/valera/l63a 
Fixing start-time and end-time related Jasmine tests.
 2014-04-23 18:40:01 +03:00
Valera Rozuvan
68dd78e9e0 Fixing start-time and end-time related Jasmine tests. 
BLD-1013
 2014-04-23 17:35:47 +03:00
John Jarvis
27256bbbb4 Merge pull request #3396 from edx/jarv/change_enrollment_cmd 
adding django admin command to change enrollment
 2014-04-23 09:44:46 -04:00
zubair-arbi
c9b419d5ad Merge pull request #3250 from edx/zub/bugfix/std1441-editdiscussioncomp 
remove location of item from loc_mapper
 2014-04-23 14:40:17 +05:00
zubiar-arbi
d2b8b4f0dd remove location of item from loc_mapper and cache 2014-04-23 13:29:39 +05:00
Waheed Ahmed
df96c17e65 Fixed toggle cheatsheet not working on component editors. 
STUD-1514
 2014-04-23 11:08:12 +05:00
Anton Stupak
d861a9a0a2 Merge pull request #3369 from edx/anton/download-handout 
Video: Add Download Handout
 2014-04-22 22:30:10 +03:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Jay Zoldak
7d0297f0df Wait for ajax post after changing language 2014-04-22 14:28:10 -04:00
David Baumgold
8351869346 Fixes #3409 2014-04-22 13:30:49 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master 
make embargo template theme-able
 2014-04-22 10:04:08 -07:00
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints 
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
 2014-04-22 12:03:43 -04:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
ichuang
f91b96565d bugfix: allow multiple choice questions to display hints 2014-04-21 22:03:26 -04:00
Jonas Jelten
3de30aba2e fixed retry invokation for calling setState 
to successfully call a function with parameters by setTimeout,
it needs to be a function that will be called by setTimeout internally.

this patch actually enables multiple tries for calling the setState function.
 2014-04-18 23:00:25 +02:00
Jay Zoldak
a78b3225bb Merge pull request #3387 from edx/zoldak/update_page_objects 
Update bok-choy page definitions
 2014-04-18 16:07:04 -04:00
John Jarvis
67128c5ff8 grammar 2014-04-18 10:13:23 -04:00
John Jarvis
b67987cd43 fixing example 2014-04-18 10:12:47 -04:00
John Jarvis
27104c93ea adding django admin command to change enrollment 2014-04-18 10:07:18 -04:00
Jay Zoldak
5e1964dd87 Update bok-choy page definitions 2014-04-18 09:35:10 -04:00
Diana Huang
19b6718c2e Merge pull request #3392 from edx/release 
Release
 2014-04-18 09:34:26 -04:00
Greg Price
92151e3bd6 Render markup in inline threads on expand/collapse 
This was a bug in 3af90ef.
 2014-04-17 15:13:00 -04:00
Diana Huang
639c42dbe2 Merge branch 'release' 2014-04-17 14:02:56 -04:00
Greg Price
862a16cac0 Show full body when expanding inline forum thread 
This was a bug in 3af90ef.

JIRA: FOR-559
 2014-04-17 12:36:03 -04:00
Adam Palay
6d356a4512 change .ui-disabled to .is-disabled 2014-04-17 11:15:02 -04:00
Adam Palay
7636ad3240 Add javascript backup if pointer-event is not supported by browser 
(STUD-1498)
 2014-04-16 14:44:50 -04:00
Brian Talbot
5940f1ff1a Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class 
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style

LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

Studio: adding in basic action Sass placeholder for use in enabling/disabling UI

Studio: applying action Sass placeholder to publish/create-draft Unit view actions

STUD-1497
 2014-04-16 14:44:30 -04:00
Valera Rozuvan
87ab4c0958 Fix for BLD-993 
In certain cases jQuery errors when it is passed an invalid
selector. A fix for this is to silently catch these errors.

Jasmine tests were added to prevent this bug in the future.

BLD-993
 2014-04-16 14:44:08 +03:00