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

11200 Commits

Author SHA1 Message Date
Awais Jibran
fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end 
pause_video event does not emit when a video ends
 2015-06-09 16:18:51 +05:00
Peter Fogg
8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation 
TNL-1891 Browse Teams: Category Subnavigation
 2015-06-08 16:32:41 -04:00
Chris
a5204310b1 Merge pull request #8267 from edx/clrux/UX-2078-error-heading-reduction 
Reducing size of error message heading
 2015-06-08 16:12:57 -04:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab 
Refactor and merge CourseViewType and CourseTab.
 2015-06-08 16:08:27 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab. 
TNL-2321
 2015-06-08 15:18:39 -04:00
Peter Fogg
17d3906c86 TNL-1891 Browse Teams: Category Subnavigation 
Introduces a tabbed view component which displays its subviews and
handles Backbone navigation between each tab. This is used to implement
the "My Teams" and "Browse" areas of the Teams tab. Right now the
content of both tabs is stubbed out with a placeholder view which should
be replaced by TNL-1893 and TNL-1892.
 2015-06-08 15:05:11 -04:00
Chris Rodriguez
4fd1ebce1c Fixing test to match CSS 2015-06-08 14:55:56 -04:00
Sarina Canelake
c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors 
Use Django 1.4 @ensure_csrf_cookie method PLAT-664
 2015-06-08 11:44:25 -04:00
Ben Patterson
f37fdaf47d Merge pull request #8386 from edx/benp/lint-fix-test_import_export 
Follow imports order guidelines.
 2015-06-07 17:13:16 -04:00
Ben Patterson
dc4b4f9022 Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 
Skip test that has become too flaky. SOL-449.
 2015-06-07 13:32:04 -04:00
Ben Patterson
d3f7bdc1e8 Skip test that has become too flaky. SOL-449. 2015-06-07 10:43:53 -04:00
Matt Drayer
3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns 2015-06-06 23:15:17 -04:00
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Nimisha Asthagiri
65bcc50e9b Merge pull request #8240 from edx/mobile/render_xblock 
MA-722 Render xBlock API
 2015-06-05 12:13:05 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Ben Patterson
b7f8bd3c80 Follow imports order guidelines. 
https://github.com/edx/edx-platform/wiki/Python-Guidelines#imports-order

Follow-up to #8368
 2015-06-05 09:43:49 -04:00
Ben Patterson
8d1651cc19 Merge pull request #8381 from edx/benp/flaky-milestones-jun2015 
Flag test as flaky. SOL-449
 2015-06-05 09:16:42 -04:00
Ben Patterson
03c0159029 Merge pull request #8368 from edx/benp/flag-flaky-import-export 
Flag test as flaky.
 2015-06-05 09:15:46 -04:00
Ben Patterson
4e39799f49 Flag test as flaky. SOL-449 2015-06-04 20:16:26 -04:00
Ben Patterson
8e37e68c3f Flag test as flaky. TNL-2386 2015-06-04 19:20:31 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may 
enroll in a course but have not signed up yet.
 2015-06-04 20:50:04 +02:00
Jim Abramson
373d948c8b Merge pull request #8356 from edx/jsa/xcom-388 
Add tests for enrollment deactivation under various modes.
 2015-06-04 10:48:12 -04:00
David Baumgold
32749a661a Merge pull request #8351 from edx/learners-dont-need-to-be-lean 
Learners don't need to be lean
 2015-06-04 10:43:27 -04:00
Calen Pennington
7c0709ce5b Merge pull request #8322 from cpennington/document-read-metrics 
Add metrics around all split-mongo database operations measuring coun…
 2015-06-04 10:08:10 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
jsa
445a0c938b Add tests for enrollment deactivation under various modes. 
A bug with the creation of inactive honor enrollment modes was caught and fixed along the way.

XCOM-388
 2015-06-04 09:40:54 -04:00
Colin-Fredericks
cc2d4cad01 DOC-2044 Fixing factor-of-ten error 2015-06-04 07:14:28 -04:00
Calen Pennington
94185e9c6f Add metrics around all split-mongo database operations measuring count, duration, and approximate size 
[PLAT-645]
 2015-06-04 07:12:45 -04:00
Peter Fogg
63c3af737c Add student bio max_length to migrations. 2015-06-03 17:07:02 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Shrhawk
ef500514c1 Merge pull request #7970 from edx/shr/bug/TNL-2038-Remove-table-of-contents-transcript-languages 
Remove "table of contents" from transcript upload languages
 2015-06-03 22:39:39 +05:00
David Baumgold
fe66625bbf Merge pull request #8323 from edx/db/unify-mako-template-imports 
Group imports together in Mako templates
 2015-06-03 13:32:27 -04:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Adam Palay
1da047bd18 fix tolerance rounding error (TNL-904) 2015-06-03 11:10:06 -04:00
Christina Roberts
0db8bac7c4 Merge pull request #8331 from edx/diana/teams-tab 
Add teams tab
 2015-06-03 10:01:06 -04:00
Awais Jibran
8956b4037d 'pause_video' event should emit in addition to the 'stop_video' when user watches the video completely (For Youtube videos) 
TNL-2167
 2015-06-03 18:33:23 +05:00
chrisndodge
348878becd Merge pull request #6906 from edx/cdodge/set-is-entrance-exam-default 
set default on is_entrance_exam
 2015-06-03 09:16:37 -04:00
cahrens
f70891b5c0 Add support for edX namespaced define. 2015-06-03 09:10:45 -04:00
cahrens
0ddf264714 2.0.14 version of requiresjs/text 2015-06-03 09:10:44 -04:00
Diana Huang
6534503c93 Add teams tab 
TNL-1939
 2015-06-03 09:10:44 -04:00
dino-cikatic
099be9e7e3 Merge pull request #8229 from edx/dcikatic/SOL-536 
Dcikatic/sol 536 [WIP]
 2015-06-03 13:55:42 +02:00
Davorin Sego
d3aa9dfd87 SOL-536 Experiment-Aware content search 2015-06-03 12:47:45 +02:00
Chris Dodge
1e371bbbae set default on is_entrance_exam 2015-06-02 21:41:40 -04:00
Braden MacDonald
ce83f5cf35 Merge pull request #8077 from open-craft/keyed-config-model-2 
Keyed ConfigurationModel + Admin functionality
 2015-06-02 16:12:41 -07:00
Calen Pennington
8f6be8ab96 Allow for keyed ConfigurationModels + New Admin UI 2015-06-02 14:50:45 -07:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions 
Add extensible course view types for edX platform
 2015-06-02 17:08:45 -04:00
chrisndodge
11fef20101 Merge pull request #8165 from edx/muhhshoaib/SOL-236/make-manual-enrollments 
SOL-236 Manual Enrollments
 2015-06-02 16:31:32 -04:00
Kelketek
cda26bb94d Merge pull request #8173 from edx/badges 
OpenBadges MVP (SOL-768)
 2015-06-02 14:30:59 -05:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00