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

22627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
f4332bb413 Add new languages from Transifex 2014-04-22 09:48:28 -04:00
Alison Hodges
54081d7405 Merge pull request #3405 from edx/ahodges/documentation/pythonsnippets 
DOC-279, correct add discussion category steps
 2014-04-22 09:36:45 -04:00
Alison Hodges
6b26c82c4f DOC-279, correct add discussion category steps 
also removed "static" for pages
 2014-04-22 09:34:23 -04:00
Sarina Canelake
a52540c8ee Merge pull request #3397 from edx/sarina/lms-2551 
Wording for batch beta email add with autoenroll (LMS-2551)
 2014-04-22 09:34:08 -04:00
Alison Hodges
bed7f2c81a Merge pull request #3407 from edx/ahodges/documentation/DOC264 
Ahodges/documentation/doc264
 2014-04-22 09:20:43 -04:00
Alison Hodges
03da681d52 DOC-264, clarify that students can opt out of email 2014-04-22 09:19:50 -04:00
Anton Stupak
581716cbdd Merge pull request #3414 from edx/anton/i18n-choice-response 
MultipleChoiceResponse i18n.
 2014-04-22 14:47:31 +03:00
polesye
ca93855fcf BLD-717: MultipleChoiceResponse i18n. 2014-04-22 12:17:16 +03:00
David Baumgold
b44ed8061f Merge pull request #3094 from yarko/yarko/fix-paver-env-assets 
ensure SERVICE_VARIANT set; pass theme to coffeescript;
 2014-04-18 23:10:46 -04:00
yarko
97ecc7a743 fix class var; set SERVICE_VARIANT to lms by default if unset (helps "paver --help" work cleanly) 2014-04-18 17:46:55 -05:00
yarko
cc86b656ea remove theme_paths var, per @sefk 2014-04-18 15:47:57 -05: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
yarko
59106f236f set reasonable SERVICE_VARIANT based on command line; ensure theme passed to coffeescript also; 2014-04-18 15:00:05 -05:00
Adam
cc67c07dfb Merge pull request #3385 from edx/adam/add-event 
pass event to callback functions in membership.coffee (LMS-2547)
 2014-04-18 13:53:21 -04:00
David Baumgold
c854ec5c3b Merge pull request #3366 from IONISx/missing-translations 
Missing translations
 2014-04-18 13:41:04 -04:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -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
5c94a3d157 Merge pull request #3389 from edx/hotfix/2014-04-17a 
Render markup in inline threads on expand/collapse
 2014-04-17 17:17:35 -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
Diana Huang
77ccf688a1 Merge pull request #3386 from edx/hotfix/2014-04-17 
Show full body when expanding inline forum thread
 2014-04-17 13:56:55 -04:00
Adam
03d85761e2 Merge pull request #3383 from edx/adam/ui-disabled-fix 
change .ui-disabled to .is-disabled
 2014-04-17 13:40:43 -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
William Desloge
8ef6a41db5 Fix missing call to translate in receipt page 2014-04-17 17:46:32 +02:00
Adam Palay
82142a4936 pass event to callback functions in membership.coffee (LMS-2547) 2014-04-17 11:43:36 -04:00
Adam Palay
6d356a4512 change .ui-disabled to .is-disabled 2014-04-17 11:15:02 -04: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