Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,531 Commits 1 Branch 0 Tags
41bcad2ffe64616f3d7f5dcce021c6ea58406fd0
Commit Graph

23531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
41bcad2ffe Update translations (autogenerated message) 2014-05-27 08:01:43 -04:00
Sarina Canelake
ed5c36ee2d Add Gujarati language 2014-05-27 07:43:03 -04:00
Sarina Canelake
84ecac97bd Add Oriya language 2014-05-27 07:42:58 -04:00
Jay Zoldak
b56e12ff03 Merge pull request #3843 from edx/zoldak/fix-brittle-checklist-acceptance-tests 
Add the needed wait for ajax statements to checklist acceptance test methods
 2014-05-23 17:02:19 -04:00
Steven Burch
6844575e08 Merge pull request #3676 from edx/f/forum-flag-digest 
Add 'roles' endpoint to user_api
 2014-05-23 13:33:59 -07:00
Will Daly
a49cf537e7 Merge pull request #3867 from edx/will/ora2-release-2014-05-23T16.59 
ORA2 release-2014-05-23T16.59
 2014-05-23 16:29:06 -04:00
Sarina Canelake
01a4f3a21f Merge pull request #3863 from edx/sarina/feature-flag-analytics-dash 
Hide beta dash Analytics tab behind feature flag
 2014-05-23 16:21:19 -04:00
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api 
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.
 2014-05-23 13:07:04 -07:00
Will Daly
a74502bd33 ORA2 release-2014-05-23T16.59 2014-05-23 15:59:53 -04:00
Sarina Canelake
dd8d8fc5dd Merge pull request #3831 from lduarte1991/lduarte-harvardx-image 
Installing Image Annotation Tool for Upcoming June 2014 Course
 2014-05-23 15:40:39 -04:00
cahrens
94f050c418 Show the menus at the top of the page. 2014-05-23 15:32:27 -04:00
Sarina Canelake
682191c474 Hide beta dash Analytics score distribution widget behind feature flag 
ENABLE_INSTRUCTOR_ANALYTICS flag is present to conditionally hide data
dependent on external analytics server installation
 2014-05-23 15:31:22 -04:00
Alison Hodges
074c4b6681 Merge pull request #3860 from edx/ahodges/documentation/DOC394 
Ahodges/documentation/doc394
 2014-05-23 15:01:20 -04:00
Alison Hodges
e3bf3d8f9a Adding enrollment upgrade events 2014-05-23 15:00:41 -04:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails 
Changes requested in PR
 2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes 
- 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
 2014-05-23 14:58:18 -04:00
lduarte1991
008bbc224b Image Annotation Tool: Add static images for openseadragon navigation 2014-05-23 14:57:48 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
lduarte1991
c24252001c Annotation Tools: Add helper functions and fixed pep8/pylint errors 
Small plugin fixes
 2014-05-23 14:57:16 -04:00
Jay Zoldak
b19acf693b Add the needed wait for ajax statements to checklist acceptance test methods 2014-05-23 13:30:31 -04:00
Jay Zoldak
fffdeeb95b Merge pull request #3845 from edx/zoldak/brittle-html-editor-tests 
Wait for ajax to complete when editing components in Studio acceptance tests
 2014-05-23 13:28:41 -04:00
Calen Pennington
ecb05e6b03 Merge pull request #2905 from edx/opaque-keys 
(WIP) Make course ids and Locations/Locators opaque to LMS/Studio
 2014-05-23 12:58:20 -04:00
Greg Price
c96bf07be6 Merge pull request #3817 from edx/gprice/forum-search-event-page 
Add page num to forum search tracking log events
 2014-05-23 12:51:38 -04:00
Mark Hoeber
38e882e8d9 Merge pull request #3857 from edx/markhoeber/documentation/doc-484 
Fixed typo in Studio Home Page panel help text
 2014-05-23 12:36:49 -04:00
Greg Price
eb0e6c909b Add page num to forum search tracking log events 2014-05-23 11:55:45 -04:00
Jay Zoldak
753189f4d5 Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests 
Skip intermittently failing js video tests
 2014-05-23 11:54:19 -04:00
Mark Hoeber
8c4be448aa Fixed typo in Studio Home Page panel help text 
DOC-484
 2014-05-23 11:46:19 -04:00
Calen Pennington
05ca40b4f9 Merge pull request #3856 from cpennington/ok-merge-from-master 
Merge from master to opaque-keys
 2014-05-23 11:42:26 -04:00
Calen Pennington
8c8cf4705a Resolve conflicts 2014-05-23 11:39:17 -04:00
Calen Pennington
6225f4d0bd Merge remote-tracking branch 'edx/master' into ok-merge-from-master 
Conflicts:
	lms/djangoapps/courseware/module_render.py
 2014-05-23 11:38:33 -04:00
Calen Pennington
9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master 
Merge master into opaque-keys
 2014-05-23 11:36:52 -04:00
Jay Zoldak
bb4f9148e0 Skip intermittently failing js video tests 2014-05-23 11:21:57 -04:00
Nimisha Asthagiri
21ddc7db00 Fixed DeleteComponent on Container Page. 2014-05-23 11:05:37 -04:00
Will Daly
234550422d Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin 
Adding new attribute to the xmodule_runtime to check admin privileges on users
 2014-05-23 10:41:31 -04:00
Calen Pennington
29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master 2014-05-23 10:05:56 -04:00
muhammad-ammar
ff1e9466be Merge pull request #3849 from edx/ammar/uniqe-course-fix 
Unique Course Fix
 2014-05-23 19:04:07 +05:00
Muhammad Ammar
3919b4a47b Unique Course Fix 2014-05-23 13:29:12 +00:00
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton 
move upload asset code for assets to AssetsView
 2014-05-23 18:24:24 +05:00
Stephen Sanchez
afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users 2014-05-23 09:23:21 -04:00
Sarina Canelake
a0799f38bf Merge pull request #3844 from edx/sarina/lms-2748 
Sarina/lms 2748
 2014-05-23 09:18:50 -04:00
Jay Zoldak
33a2725919 Merge pull request #3850 from edx/zoldak/revert-paver-quality 
Revert "added and updated pavelib/quality.py..."
 2014-05-23 08:42:55 -04:00
Jay Zoldak
4771242d57 Revert "added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks" 
This reverts commit 7fd2305f39.
 2014-05-23 08:40:43 -04:00
Anton Stupak
77c3233f29 Merge pull request #3824 from edx/anton/fix-transcript-on-ipad 
Video: Fix transcript displaying on iPad.
 2014-05-23 10:49:56 +03:00
polesye
2133ebd0a2 BLD-1033: Fix transcript displaying on iPad. 2014-05-23 08:31:26 +03:00
Andy Armstrong
b6f933a1f5 Merge pull request #3838 from louyihua/translation-fix 
i18n: Make static strings in xmodule files extractable
 2014-05-23 00:30:22 -04:00
Sarina Canelake
faeee559fd Fix Instructor Dash UX (LMS-2748) 2014-05-22 16:53:20 -04:00
Jay Zoldak
4a86b926c5 Wait for ajax to complete when editing components in Studio acceptance tests 2014-05-22 16:45:18 -04:00
Calen Pennington
35083ad9f9 Fix bad uses of course_id/location/locator in new code on master 2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Diana Huang
16f0c9d1ee Merge pull request #3840 from antoviaque/mentoring-opaque-keys 
mentoring-opaque-keys: Adds support for opaque keys
 2014-05-22 15:45:48 -04:00