Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cahrens
f61421d7fe Tests for raw editor and minor wording changes. 2014-04-23 15:14:08 -04:00
Mark Hoeber
fe50a350b5 UI String Updates for Raw HTML Editor Change 
Modified the Raw HTML template text and the help string for the Editor
setting.
 2014-04-23 15:13:56 -04:00
Frances Botsford
6e8ccc51db adjust codemirror window on raw HTML editor 2014-04-23 15:13:31 -04:00
cahrens
ae886f1bc6 Add support for raw HTML editor. 
STUD-1562
 2014-04-23 15:12:38 -04:00
Carson Gee
5775634482 Added jasmine tests and factored out javascript functions to new file 2014-04-23 14:56:32 -04:00
Carson Gee
c7713064d5 Reworked UI for clarity, removed reload, and added Bok-Choy tests 2014-04-23 14:56:31 -04:00
Jay Zoldak
a660cd8539 Set up page objects and base test file for staff view and staff debug. 2014-04-23 14:56:31 -04:00
ichuang
64a9ec5bf4 add problem reset link to staff debug page 2014-04-23 14:56:30 -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
9d9f28dab3 Merge pull request #3275 from edx/valera/l52a 
TESTS: Add tests for fix of end-time functionality in the video player
 2014-04-23 19:26:11 +03: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
Andy Armstrong
56bf7d8631 Merge pull request #3437 from edx/andya/rc-fix-tinymce 
Make TinyMCE more tolerant about HTML elements
 2014-04-23 10:38:58 -04:00
Valera Rozuvan
68dd78e9e0 Fixing start-time and end-time related Jasmine tests. 
BLD-1013
 2014-04-23 17:35:47 +03:00
Adam
0e72c8c06b Merge pull request #3442 from edx/adam/fix-template-error 
fixes templating error (LMS-2560)
 2014-04-23 10:04:07 -04:00
Andy Armstrong
4cfa280502 Remove verify_html as it isn't supported in TinyMCE 4 2014-04-23 09:52:23 -04: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
Adam Palay
d61abab1d8 fixes templating error (LMS-2560) 2014-04-23 09:20:51 -04:00
Mark Hoeber
5f0d8f31cd Merge pull request #3267 from edx/markhoeber/documentation/doc-255 
JavaScript update in developer documentation
 2014-04-23 09:17:17 -04:00
Waqas Khalid
1a086927ac Merge pull request #3410 from mlkwaqas/waqas/lms2510-banner-toggle-off 
User doesn't exist in verify student banner toggle off view
 2014-04-23 18:10:01 +05:00
Waqas
442db0b4aa User doesn't exist in verify student banner toggle off view 
LMS-2510
 2014-04-23 15:36:56 +05: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
Waheed Ahmed
04b9f3371a Merge pull request #3368 from edx/waheed/stud1514-toggle-cheatsheet-not-working 
Fixed toggle cheatsheet not working on component editors.
 2014-04-23 14:34:11 +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
ichuang
6647cc1958 allow capa poroblems access to anonymous_student_id 
fix system->capa_system in capa_problem change for anonid
 2014-04-22 21:00:01 -04:00
Andy Armstrong
b5e99614c3 Make TinyMCE more tolerant about HTML elements 
STUD-1565
 2014-04-22 18:53:52 -04:00
David Baumgold
ac1e566bce Refer to process docs in CONTRIBUTING.rst 2014-04-22 17:08:22 -04:00
David Baumgold
4db7f33196 Added process documentation 2014-04-22 17:06:16 -04:00
srpearce
97d587c4c8 Merge pull request #3431 from edx/sylvia/docs/DOC-263 
Update screenshots and add feedback prompt info
 2014-04-22 17:02:47 -04:00
Alison Hodges
1ca6a86c79 Merge pull request #3433 from edx/ahodges/documentation/changelog 
Removed rebase error from change log
 2014-04-22 16:41:02 -04:00
Alison Hodges
3c8c7bb5fd Removed rebase error from change log 2014-04-22 16:40:32 -04:00
Sylvia Pearce
ac86b54858 Update screenshots and add feedback prompt info 2014-04-22 16:03:19 -04:00
Mark Hoeber
f6e11f14c9 JavaScript extentions doc update 
doc-255
 2014-04-22 15:58:49 -04:00
David Baumgold
6fc05bcacf Merge pull request #3429 from edx/move-experiments-rst 
Move experiments.rst into the en_us directory
 2014-04-22 15:57:17 -04:00
Alison Hodges
f4d6bbaf3c Merge pull request #3388 from edx/ahodges/documentation/LMS2525 
Ahodges/documentation/lms2525
 2014-04-22 15:45:49 -04:00
Alison Hodges
52c34886d2 doc for LMS-2525: feature changes for student enrollment 2014-04-22 15:44:57 -04: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
Jay Zoldak
ac980460cc Merge pull request #3428 from edx/zoldak/fix-lang-test 
Wait for ajax post after changing language
 2014-04-22 15:13:44 -04:00
David Baumgold
8b40d728f0 Move experiments.rst into the en_us directory 2014-04-22 15:11:23 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
David Baumgold
7c89055089 Merge pull request #3404 from edx/watchdog-in-paver-reqs 
Added watchdog to Paver requirements
 2014-04-22 14:39:27 -04:00
Jay Zoldak
7d0297f0df Wait for ajax post after changing language 2014-04-22 14:28:10 -04:00
Stephen Sanchez
b993dfbdb3 Merge pull request #3424 from edx/ora2/release-2014-04-22T16.55 
Release for Apr 22, 2014
 2014-04-22 14:03:46 -04:00
David Baumgold
8351869346 Fixes #3409 2014-04-22 13:30:49 -04:00