Commits · cc86b656ea8273a0a2b403df39658cc16ad896dc · edx / edx-platform · GitLab

18 Apr, 2014 5 commits
- remove theme_paths var, per @sefk · cc86b656
  yarko committed Apr 18, 2014
  
  cc86b656 Browse Files
- set reasonable SERVICE_VARIANT based on command line; ensure theme passed to coffeescript also; · 59106f23
  yarko committed Apr 18, 2014
  
  59106f23 Browse Files
- Merge pull request #3385 from edx/adam/add-event · cc67c07d
```
pass event to callback functions in membership.coffee (LMS-2547)
```
  Adam committed Apr 18, 2014
  cc67c07d Browse Files
- Merge pull request #3366 from IONISx/missing-translations · c854ec5c
```
Missing translations
```
  David Baumgold committed Apr 18, 2014
  c854ec5c Browse Files
- Merge pull request #3392 from edx/release · 19b6718c
```
Release
```
  Diana Huang committed Apr 18, 2014
  19b6718c Browse Files
17 Apr, 2014 9 commits
- Merge pull request #3389 from edx/hotfix/2014-04-17a · 5c94a3d1
```
Render markup in inline threads on expand/collapse
```
  Greg Price committed Apr 17, 2014
  5c94a3d1 Browse Files
- Render markup in inline threads on expand/collapse · 92151e3b
```
This was a bug in 3af90ef2.
```
  Greg Price committed Apr 17, 2014
  92151e3b Browse Files
- Merge branch 'release' · 639c42db
  Diana Huang committed Apr 17, 2014
  
  639c42db Browse Files
- Merge pull request #3386 from edx/hotfix/2014-04-17 · 77ccf688
```
Show full body when expanding inline forum thread
```
  Diana Huang committed Apr 17, 2014
  77ccf688 Browse Files
- Merge pull request #3383 from edx/adam/ui-disabled-fix · 03d85761
```
change .ui-disabled to .is-disabled
```
  Adam committed Apr 17, 2014
  03d85761 Browse Files
- Show full body when expanding inline forum thread · 862a16ca
```
This was a bug in 3af90ef2.

JIRA: FOR-559
```
  Greg Price committed Apr 17, 2014
  862a16ca Browse Files
- Fix missing call to translate in receipt page · 8ef6a41d
  William Desloge committed Apr 17, 2014
  
  8ef6a41d Browse Files
- pass event to callback functions in membership.coffee (LMS-2547) · 82142a49
  Adam Palay committed Apr 17, 2014
  
  82142a49 Browse Files
- change .ui-disabled to .is-disabled · 6d356a45
  Adam Palay committed Apr 17, 2014
  
  6d356a45 Browse Files
16 Apr, 2014 26 commits
- Merge branch 'release' · 79fea620
```
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
```
  Diana Huang committed Apr 16, 2014
  79fea620 Browse Files
- Merge pull request #3101 from edx/talbs/ui-disabled · afd82771
```
UI: Disabled Utility Classes
```
  Adam committed Apr 16, 2014
  afd82771 Browse Files
- Merge pull request #3377 from edx/sylvia/docs/DOC-293 · ce330374
```
Update "Transcripts in Additional Languages" in Video section
```
  srpearce committed Apr 16, 2014
  ce330374 Browse Files
- Tiny change · c6de6611
  Sylvia Pearce committed Apr 16, 2014
  
  c6de6611 Browse Files
- Update "Transcripts in Additional Languages" in Video section · f3cc925f
  Sylvia Pearce committed Apr 16, 2014
  
  f3cc925f Browse Files
- Merge pull request #3370 from edx/markhoeber/documentation/doc-272 · 0bb5a1a2
```
Release notes 4-16-14
```
  Mark Hoeber committed Apr 16, 2014
  0bb5a1a2 Browse Files
- Release notes 4-16-14 · 591f62c3
```
doc-272
```
  Mark Hoeber committed Apr 16, 2014
  591f62c3 Browse Files
- Merge pull request #3376 from edx/sylvia/docs/small_corrections · 4b08604e
```
Sylvia/docs/small corrections
```
  srpearce committed Apr 16, 2014
  4b08604e Browse Files
- Add javascript backup if pointer-event is not supported by browser · 7636ad32
```
(STUD-1498)
```
  Adam Palay committed Apr 16, 2014
  7636ad32 Browse Files
- Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class · 5940f1ff
```
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
```
  Brian Talbot committed Apr 16, 2014
  5940f1ff Browse Files
- Small changes · c10fb77d
  Sylvia Pearce committed Apr 16, 2014
  
  c10fb77d Browse Files
- Small changes · 027b0064
  Sylvia Pearce committed Apr 16, 2014
  
  027b0064 Browse Files
- Resize image · 5a549d21
  Sylvia Pearce committed Apr 16, 2014
  
  5a549d21 Browse Files
- Small edits to correct typos, etc. · f60c8e3a
  Sylvia Pearce committed Apr 16, 2014
  
  f60c8e3a Browse Files
- Merge pull request #3084 from edx/sarina/improve-bulk-beta-add · 1622216b
```
Improve the batch beta tester add feature
```
  Sarina Canelake committed Apr 16, 2014
  1622216b Browse Files
- Merge pull request #2550 from edx/markhoeber/documentation/stud-1202 · 7e3d661f
```
Doc - First draft for shuffle changes to Building Course guide
```
  Mark Hoeber committed Apr 16, 2014
  7e3d661f Browse Files
- Merge pull request #3355 from edx/jsa/user-profile-tests · 8e0caa89
```
django_comment_client/forum: add test coverage for user_profile view
```
  Jim Abramson committed Apr 16, 2014
  8e0caa89 Browse Files
- Doc - for shuffle, targeted feedback, and answer pools changes to Building Course guide · 52437263
  Mark Hoeber committed Apr 16, 2014
  
  52437263 Browse Files
- django_comment_client/forum: add test coverage for user_profile view · 0738b6c3
```
JIRA: FOR-496
```
  jsa committed Apr 16, 2014
  0738b6c3 Browse Files
- Accept usernames in Batch Enrollment widget · bddae213
```
Respond to pull request comments
```
  Sarina Canelake committed Apr 16, 2014
  bddae213 Browse Files
- Merge pull request #3283 from edx/will/ora2-delete-student-state · 84f63cd7
```
Reset submission API scores in beta and legacy instructor dash
```
  Will Daly committed Apr 16, 2014
  84f63cd7 Browse Files
- Merge pull request #3356 from edx/valera/l73a · 3a7c3e7c
```
Fix for BLD-993
```
  Valera Rozuvan committed Apr 16, 2014
  3a7c3e7c Browse Files
- Reset submission API scores in beta and legacy instructor dash · 0b40354c
  Will Daly committed Apr 16, 2014
  
  0b40354c Browse Files
- Clear batch enrollment and beta text fields upon button click · 82b085b4
  Sarina Canelake committed Apr 16, 2014
  
  82b085b4 Browse Files
- Add "Auto Enroll" option for bulk beta add · ede21224
  Sarina Canelake committed Apr 16, 2014
  
  ede21224 Browse Files
- Allow batch beta enrollment by username · 4f38b69e
  Sarina Canelake committed Apr 16, 2014
  
  4f38b69e Browse Files