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

22600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jonas Jelten
49f3eb3bc4 added jj to the author list 2014-04-18 22:56:51 +02:00
Diana Huang
79fea6205e Merge branch 'release' 
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
 2014-04-16 15:41:59 -04:00
Adam
afd827718d Merge pull request #3101 from edx/talbs/ui-disabled 
UI: Disabled Utility Classes
 2014-04-16 15:23:01 -04:00
srpearce
ce33037468 Merge pull request #3377 from edx/sylvia/docs/DOC-293 
Update "Transcripts in Additional Languages" in Video section
 2014-04-16 15:11:50 -04:00
Sylvia Pearce
c6de6611de Tiny change 2014-04-16 15:11:23 -04:00
Sylvia Pearce
f3cc925fdf Update "Transcripts in Additional Languages" in Video section 2014-04-16 15:08:10 -04:00
Mark Hoeber
0bb5a1a28d Merge pull request #3370 from edx/markhoeber/documentation/doc-272 
Release notes 4-16-14
 2014-04-16 15:07:49 -04:00
Mark Hoeber
591f62c39a Release notes 4-16-14 
doc-272
 2014-04-16 15:01:34 -04:00
srpearce
4b08604e83 Merge pull request #3376 from edx/sylvia/docs/small_corrections 
Sylvia/docs/small corrections
 2014-04-16 14:48:08 -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
Sylvia Pearce
c10fb77d4c Small changes 2014-04-16 14:18:59 -04:00
Sylvia Pearce
027b00641d Small changes 2014-04-16 14:18:17 -04:00
Sylvia Pearce
5a549d2133 Resize image 2014-04-16 14:14:42 -04:00
Sylvia Pearce
f60c8e3ad9 Small edits to correct typos, etc. 2014-04-16 14:10:57 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add 
Improve the batch beta tester add feature
 2014-04-16 14:07:51 -04:00
Mark Hoeber
7e3d661fda Merge pull request #2550 from edx/markhoeber/documentation/stud-1202 
Doc - First draft for shuffle changes to Building Course guide
 2014-04-16 13:47:53 -04:00
Jim Abramson
8e0caa8935 Merge pull request #3355 from edx/jsa/user-profile-tests 
django_comment_client/forum: add test coverage for user_profile view
 2014-04-16 13:38:47 -04:00
Mark Hoeber
52437263e3 Doc - for shuffle, targeted feedback, and answer pools changes to Building Course guide 2014-04-16 12:53:48 -04:00
jsa
0738b6c327 django_comment_client/forum: add test coverage for user_profile view 
JIRA: FOR-496
 2014-04-16 11:51:33 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget 
Respond to pull request comments
 2014-04-16 10:46:54 -04:00
Will Daly
84f63cd79e Merge pull request #3283 from edx/will/ora2-delete-student-state 
Reset submission API scores in beta and legacy instructor dash
 2014-04-16 10:17:41 -04:00
Valera Rozuvan
3a7c3e7c01 Merge pull request #3356 from edx/valera/l73a 
Fix for BLD-993
 2014-04-16 16:47:51 +03:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
82b085b4e1 Clear batch enrollment and beta text fields upon button click 2014-04-16 09:20:23 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
Valera Rozuvan
3896fb099d Merge pull request #3354 from edx/valera/l63b 
Fix for BLD-993
 2014-04-16 16:08:23 +03: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
Valera Rozuvan
9e8941f357 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:26:05 +03:00
raeeschachar
cf759414af Merge pull request #3319 from edx/raees/update-running-acceptance-tests-bokchoy 
Update Running Acceptance Tests Bok_Choy
 2014-04-16 12:29:27 +05:00
Alison Hodges
860e2f1e6e Merge pull request #3365 from edx/ahodges/documentation/DOC282 
DOC-282, table width must be 80% for change log
 2014-04-15 17:56:24 -04:00
Alison Hodges
0dca3cbab0 DOC-282, table width must be 80% for change log 2014-04-15 17:55:55 -04:00
Alison Hodges
0591d113ca Merge pull request #3364 from edx/ahodges/documentation/changelogrecovery 
Reorganized, resequenced, removed redundancies
 2014-04-15 17:46:10 -04:00
Alison Hodges
d47b8bde39 Reorganized, resequenced, removed redundancies 2014-04-15 17:44:57 -04:00
Alison Hodges
9e95aa33b2 Merge pull request #3257 from edx/markhoeber/documentation/doc-249 
04/09/2014 Release Notes
 2014-04-15 17:26:21 -04:00
Alison Hodges
34177141fe Merge pull request #3351 from edx/ahodges/documentation/DOC253 
Ahodges/documentation/doc253
 2014-04-15 17:18:00 -04:00
Alison Hodges
b60dd38614 DOC-253, adds View in Studio button to LMS 2014-04-15 17:17:26 -04:00
Sylvia Pearce
1f67fea18c Release notes 4-15-14 2014-04-15 17:13:33 -04:00
Sarina Canelake
352ca49cb0 Merge pull request #3362 from edx/sarina/fix_batch_enrollment_emails 
Fix batch enrollment box email sending
 2014-04-15 16:53:03 -04:00
srpearce
0e6e292595 Merge pull request #3022 from edx/markhoeber/documentation/STUD-1428 
First Draft - Documentation for HTML Editor Changes
 2014-04-15 16:31:54 -04:00
Mark Hoeber
55f7d28c62 Documentation for HTML editor upgrade 
STUD-1428
 2014-04-15 16:28:36 -04:00
Sarina Canelake
3ba143eb9c Fix batch enrollment box email sending 2014-04-15 16:14:11 -04:00
Will Daly
510889e2f2 Merge pull request #3359 from edx/will/ora2-release-2014-04-15 
Updated ORA2 to release-2014-04-15
 2014-04-15 15:34:51 -04:00
Andy Armstrong
2dcff3e91d Merge pull request #3361 from edx/andya/rc-fix-duplicate-buttons 
Fix duplicate save and cancel buttons in Studio
 2014-04-15 15:33:59 -04:00
Andy Armstrong
1b2d1858fa Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 15:28:22 -04:00
Andy Armstrong
bd709a77ee Merge pull request #3339 from edx/andya/fix-duplicate-buttons 
Fix duplicate save and cancel buttons showing when editing xblocks
 2014-04-15 15:16:34 -04:00
Will Daly
7f755315ac Updated ORA2 to release-2014-04-15 2014-04-15 14:30:22 -04:00
Andy Armstrong
a3b2809601 Fix duplicate save and cancel buttons in Studio 
STUD-1531

Also add support for refreshing the modal on custom save
 2014-04-15 14:04:55 -04:00