Commits · 63ef3bd05a67be9955a6c3d86c84d7a9e7d92e5d · edx / edx-platform · GitLab

26 May, 2014 1 commit
- i18n: More extractable & localizable strings in xmodules · 63ef3bd0
  louyihua committed May 26, 2014
  
  63ef3bd0 Browse Files
24 May, 2014 3 commits
- Merge pull request #3861 from edx/sarina/fix-quality · d01af063
```
Fix quality violations from opaque-keys
```
  Sarina Canelake committed May 24, 2014
  d01af063 Browse Files
- Fixed some TODOs, removed irrelevant ones · 6f7bc7e1
  Julia Hansbrough committed May 24, 2014
  
  6f7bc7e1 Browse Files
- StaffFactories accept `course_key`s, not `course`s. Make that clear in the interface. · 110719de
  Sarina Canelake committed May 24, 2014
  
  110719de Browse Files
23 May, 2014 36 commits
- Merge pull request #3843 from edx/zoldak/fix-brittle-checklist-acceptance-tests · b56e12ff
```
Add the needed wait for ajax statements to checklist acceptance test methods
```
  Jay Zoldak committed May 23, 2014
  b56e12ff Browse Files
- Merge pull request #3676 from edx/f/forum-flag-digest · 6844575e
```
Add 'roles' endpoint to user_api
```
  Steven Burch committed May 23, 2014
  6844575e Browse Files
- Merge pull request #3867 from edx/will/ora2-release-2014-05-23T16.59 · a49cf537
```
ORA2 release-2014-05-23T16.59
```
  Will Daly committed May 23, 2014
  a49cf537 Browse Files
- Merge pull request #3863 from edx/sarina/feature-flag-analytics-dash · 01a4f3a2
```
Hide beta dash Analytics tab behind feature flag
```
  Sarina Canelake committed May 23, 2014
  01a4f3a2 Browse Files
- Add 'forum_roles' endpoint to user_api · e4df2c2c
```
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
```
  stv committed May 23, 2014
  e4df2c2c Browse Files
- ORA2 release-2014-05-23T16.59 · a74502bd
  Will Daly committed May 23, 2014
  
  a74502bd Browse Files
- Merge pull request #3831 from lduarte1991/lduarte-harvardx-image · dd8d8fc5
```
Installing Image Annotation Tool for Upcoming June 2014 Course
```
  Sarina Canelake committed May 23, 2014
  dd8d8fc5 Browse Files
- Show the menus at the top of the page. · 94f050c4
  cahrens committed May 23, 2014
  
  94f050c4 Browse Files
- Hide beta dash Analytics score distribution widget behind feature flag · 682191c4
```
ENABLE_INSTRUCTOR_ANALYTICS flag is present to conditionally hide data
dependent on external analytics server installation
```
  Sarina Canelake committed May 23, 2014
  682191c4 Browse Files
- Merge pull request #3860 from edx/ahodges/documentation/DOC394 · 074c4b66
```
Ahodges/documentation/doc394
```
  Alison Hodges committed May 23, 2014
  074c4b66 Browse Files
- Adding enrollment upgrade events · e3bf3d8f
  Alison Hodges committed May 23, 2014
  
  e3bf3d8f Browse Files
- Image Annotation Tool: Add linkback functionality to image thumbnails · e4e4b32c
```
Changes requested in PR
```
  lduarte1991 committed May 23, 2014
  e4e4b32c Browse Files
- Image Annotation Tool Fixes · 0318c955
```
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
```
  lduarte1991 committed May 23, 2014
  0318c955 Browse Files
- Image Annotation Tool: Add static images for openseadragon navigation · 008bbc22
  lduarte1991 committed May 23, 2014
  
  008bbc22 Browse Files
- Image Annotation Tool: create xmodule and install js files · 32e96681
  lduarte1991 committed May 23, 2014
  
  32e96681 Browse Files
- Annotation Tools: Add helper functions and fixed pep8/pylint errors · c2425200
```
Small plugin fixes
```
  lduarte1991 committed May 23, 2014
  c2425200 Browse Files
- Opaque-keys: fix pylint violations · 265fa826
  Sarina Canelake committed May 23, 2014
  
  265fa826 Browse Files
- Opaque-keys: fix pep8 violations · bf32f5a7
  Sarina Canelake committed May 23, 2014
  
  bf32f5a7 Browse Files
- Add the needed wait for ajax statements to checklist acceptance test methods · b19acf69
  Jay Zoldak committed May 23, 2014
  
  b19acf69 Browse Files
- Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests · fffdeeb9
```
Wait for ajax to complete when editing components in Studio acceptance tests
```
  Jay Zoldak committed May 23, 2014
  fffdeeb9 Browse Files
- Merge pull request #2905 from edx/opaque-keys · ecb05e6b
```
(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
```
  Calen Pennington committed May 23, 2014
  ecb05e6b Browse Files
- Merge pull request #3817 from edx/gprice/forum-search-event-page · c96bf07b
```
Add page num to forum search tracking log events
```
  Greg Price committed May 23, 2014
  c96bf07b Browse Files
- Merge pull request #3857 from edx/markhoeber/documentation/doc-484 · 38e882e8
```
Fixed typo in Studio Home Page panel help text
```
  Mark Hoeber committed May 23, 2014
  38e882e8 Browse Files
- Add page num to forum search tracking log events · eb0e6c90
  Greg Price committed May 23, 2014
  
  eb0e6c90 Browse Files
- Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests · 753189f4
```
Skip intermittently failing js video tests
```
  Jay Zoldak committed May 23, 2014
  753189f4 Browse Files
- Fixed typo in Studio Home Page panel help text · 8c4be448
```
DOC-484
```
  Mark Hoeber committed May 23, 2014
  8c4be448 Browse Files
- Merge pull request #3856 from cpennington/ok-merge-from-master · 05ca40b4
```
Merge from master to opaque-keys
```
  Calen Pennington committed May 23, 2014
  05ca40b4 Browse Files
- Resolve conflicts · 8c8cf470
  Calen Pennington committed May 23, 2014
  
  8c8cf470 Browse Files
- Merge remote-tracking branch 'edx/master' into ok-merge-from-master · 6225f4d0
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
```
  Calen Pennington committed May 23, 2014
  6225f4d0 Browse Files
- Merge pull request #3834 from cpennington/ok-merge-from-master · 9feff628
```
Merge master into opaque-keys
```
  Calen Pennington committed May 23, 2014
  9feff628 Browse Files
- Skip intermittently failing js video tests · bb4f9148
  Jay Zoldak committed May 23, 2014
  
  bb4f9148 Browse Files
- Fixed DeleteComponent on Container Page. · 21ddc7db
  Nimisha Asthagiri committed May 23, 2014
  
  21ddc7db Browse Files
- Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin · 23455042
```
Adding new attribute to the xmodule_runtime to check admin privileges on users
```
  Will Daly committed May 23, 2014
  23455042 Browse Files
- Merge remote-tracking branch 'edx/master' into ok-merge-from-master · 29f7fe14
  Calen Pennington committed May 23, 2014
  
  29f7fe14 Browse Files
- Merge pull request #3849 from edx/ammar/uniqe-course-fix · ff1e9466
```
Unique Course Fix
```
  muhammad-ammar committed May 23, 2014
  ff1e9466 Browse Files
- Unique Course Fix · 3919b4a4
  Muhammad Ammar committed May 23, 2014
  
  3919b4a4 Browse Files