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

25113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url. 
LMS-11217
 2014-08-20 18:30:58 +05:00
Waqas Khalid
14de1a3f9e Merge pull request #4203 from mlkwaqas/waqas/for581-truncated-markup-on-user-profile 
Truncated markup can be displayed in forums user profile view
 2014-08-20 15:45:20 +05:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view 
FOR-581
 2014-08-20 14:33:23 +05:00
muhammad-ammar
ca3bd2f83f Merge pull request #4496 from edx/ammar/bok-choy-cms-video-editor-tests 
Bok-Choy CMS Video Editor Tests
 2014-08-20 13:19:10 +05:00
jhelbert
92fa79dbd0 Merge pull request #4871 from edx/jhelbert/api-upgrade-check 
This confirms the data api upgrade
 2014-08-19 16:36:29 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Will Daly
43368b29b0 Merge pull request #4886 from edx/will/ecom-122 
Fix messaging for professional ed under auto-registration
 2014-08-19 14:58:18 -04:00
Alison Hodges
eeaeaf6c22 Merge pull request #4897 from edx/ahodges/doc/twitter 
Keeps in sync with edx-analytics-dashboard
 2014-08-19 14:53:34 -04:00
Alison Hodges
12d8ef5405 Keeps in sync with edx-analytics-dashboard 2014-08-19 14:52:53 -04:00
David Baumgold
b4d14a566e Merge pull request #4892 from edx/db/marcnu-quality 
Cleaning up a few quality violations
 2014-08-19 14:42:40 -04:00
Alison Hodges
0a8cd53d21 Merge pull request #4895 from edx/ahodges/doc/preface 
Added note to doc team to update in both repos
 2014-08-19 14:25:54 -04:00
Alison Hodges
ec0eefb806 Added note to doc team to update in both repos 2014-08-19 14:01:43 -04:00
Mark Hoeber
a79703e8e6 Merge pull request #4856 from edx/markhoeber-documentation-outline-template-update 
Updated outline template help text
 2014-08-19 13:42:20 -04:00
Mark Hoeber
e8ff315206 Updated outline template help text 2014-08-19 12:45:53 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support 
Microsites alongside Theme
 2014-08-19 12:39:21 -04:00
David Baumgold
fb0ee690f2 Cleaning up a few quality violations 2014-08-19 11:49:43 -04:00
David Baumgold
7bb2535df2 Merge pull request #4649 from MarCnu/contentstore-streaming-range 
Contentstore streaming range
 2014-08-19 11:46:40 -04:00
Renzo Lucioni
3aee8a2923 Merge pull request #4876 from edx/web-analytics/noninteraction-events 
Mark calls to track() on pageload as noninteraction events
 2014-08-19 11:24:44 -04:00
MarCnu
77f7f26933 Add HTTP_RANGE compatibility for ContentStore file streaming 
Currently, users can only download ContentStore files from first byte to
last byte.

With this change, when a request to the ContentStore includes the HTTP
"Range" parameter, it is parsed and StaticContentStream will stream the
requested bytes.

This change makes possible to stream video files (.mp4 especially) from
the ContentStore. Users can now seek a specific time in the video
without loading all the file.

This is useful for courses with a limited number of students that
doesn't require a dedicated video server.
 2014-08-19 16:46:31 +02:00
David Baumgold
b9eaf32985 Merge pull request #4875 from edx/db/edx-wiki-to-openedx 
Update comments to point to openedx.atlassian.net
 2014-08-19 10:23:27 -04:00
Jesse Zoldak
fc285ee486 Merge pull request #4864 from edx/ammar/fix-pause-state-promise-broken-issue 
Fix Video Player Pause Issue
 2014-08-19 10:20:05 -04:00
Will Daly
f26e88bdd9 Fix messaging for professional ed under auto-registration 2014-08-19 07:53:26 -04:00
MarCnu
d5db673a8a AUTHORS update 2014-08-19 09:50:25 +02:00
Don Mitchell
a3c2a54bbf Merge pull request #4877 from edx/dhm/course_id_pattern 
Rewrite course url matcher to not be greedy
 2014-08-18 18:01:57 -04:00
Don Mitchell
716f5dfd2d Merge pull request #4878 from edx/dhm/split_branch_agnostic 
Make it branch agnostic
 2014-08-18 17:11:10 -04:00
Don Mitchell
3c3a316f08 Make it branch agnostic 
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
 2014-08-18 16:19:46 -04:00
Don Mitchell
8d070e6422 Rewrite course url matcher to not be greedy 
LMS-11181
 2014-08-18 16:18:22 -04:00
Alison Hodges
2c366427bc Merge pull request #4865 from edx/ahodges/doc/DOC815 
Added a relaunch invitation template email
 2014-08-18 15:51:01 -04:00
Alison Hodges
bcbe2657e3 Added a relaunch invitation template email 2014-08-18 15:50:18 -04:00
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net 
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
 2014-08-18 15:34:06 -04:00
Renzo Lucioni
326deb37c2 Mark calls to track() on pageload as noninteraction events 2014-08-18 14:51:16 -04:00
Sarina Canelake
cbffcd2fbb Merge pull request #4867 from louyihua/localization-cms 
Translation & secure-aware changes to studio's settings page
 2014-08-18 13:50:18 -04:00
louyihua
14cd7d7763 Translation & secure-aware changes to studio's settings page 
1. Change the link of course's about page secure aware, which displays 'https' or 'http' prefix according to the current protocol.
2. Make the email in this page translatable.
 2014-08-19 01:13:23 +08:00
Muhammad Ammar
f93e4f2775 Bok-Choy CMS Video Editor Tests 2014-08-18 15:44:30 +00:00
Muhammad Ammar
ebee3c406e Fix Video Player Pause Issue 2014-08-18 13:18:15 +00:00
Daniel Friedman
70d47fb54d Merge pull request #4740 from edx/dan-ben/staff-lock-outline 
Add ability to set staff lock from course outline
 2014-08-16 18:02:02 -04:00
Ben McMorran
12a5781725 Add ability to set staff lock from course outline 2014-08-16 15:58:42 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Don Mitchell
3b43f34b20 XML export maps keys into xml expected format 2014-08-15 16:02:48 -04:00
Sarina Canelake
b6f82a949f Merge pull request #4848 from Stanford-Online/njdupoux/no-pending-instructor-tasks 
Instructor Dash: Display message when no tasks running
 2014-08-15 14:31:23 -04:00
njdup
93d088505f Instructor Dash: Display message when there are no tasks running 
This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
 2014-08-15 10:35:01 -07:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
clytwynec
310778dfa7 Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs 
set root logging level for acceptance tests to ERROR
 2014-08-15 13:08:56 -04:00
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Sarina Canelake
5f14959231 Merge pull request #4846 from edx/db/update-i18n-tools 
Update i18n-tools
 2014-08-15 11:02:11 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00