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

11358 Commits

Author SHA1 Message Date
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release 
Release
 2015-04-08 15:40:45 -04:00
Adam
0298180e30 Merge pull request #7632 from edx/adam/revert-multiple-email-queues 
Revert "use different queue for smaller emails (TNL-1591)"
 2015-04-08 14:47:45 -04:00
Marko Jevtić
5cb7fe7390 Merge pull request #7567 from edx/mjevtic/SOL-294 
(SOL-294) CSS style that will display ellipsis properly
 2015-04-08 19:43:25 +02:00
Marko Jevtić
42896452a1 Merge pull request #7576 from edx/mjevtic/more_search_results 
Fixes show more results section of the lms courseware search
 2015-04-08 18:49:57 +02:00
marjev
050a53d954 (SOL-294) CSS style that will properly display ellipsis 2015-04-08 18:46:23 +02:00
Adam Palay
9fa8187ffc Revert "use different queue for smaller emails (TNL-1591)" 
This reverts commit c2e5bd3d98.
 2015-04-08 12:33:09 -04:00
Chris
35db7f34af Merge pull request #7580 from edx/clrux/UX-1909-a11y-button-contrast 
Changed color of gray to be slightly darker for AA compliance
 2015-04-08 11:54:20 -04:00
Chris
468d538e0c Merge pull request #7584 from edx/clrux/UX-1911-a11y-remove-nav 
Changes the nav element to a div
 2015-04-08 11:25:32 -04:00
Adam Palay
d9a21bdf4d use email context for keyword substitution, cutting down on db queries (TNL-1591) 2015-04-08 11:22:26 -04:00
Chris Rodriguez
7b9bf47072 LMS: changed value of gray (m-gray-d1) to be darker or a11y compliance 2015-04-08 10:56:11 -04:00
Chris Rodriguez
62cc1436ad LMS: changing lists to divs for certain items in the payment flow 2015-04-08 10:07:10 -04:00
Phil McGachey
bc293b0517 [LTI Provider] Made reverifications parameter to courseware optional 2015-04-07 10:39:26 -04:00
Chris Rodriguez
ea13689c6f LMS: changing nav element in payment flow to div element for a11y improvements 2015-04-07 10:04:21 -04:00
Chris
397da0dbde Merge pull request #7586 from edx/clrux/UX-1912-a11y-fix-heading-order 
Correcting heading levels
 2015-04-07 10:01:16 -04:00
aamir-khan
917ca595cc ECOM-1289: added the re-verification service to implement the re-verification xblock 2015-04-07 18:09:53 +05:00
marjev
7f45900cbc Fixes show more results section of the lms courseware search 2015-04-07 08:34:11 +00:00
Chris Rossi
3256eb1ff6 Architecture for arbitrary field overrides, field overrides for 
individual students, and a reimplementation of the individual due date
feature.

This work introduces an architecture, used with the 'authored_data'
portion of LmsFieldData, which allows arbitrary field overrides to be
made for fields that are part of the course content or settings (Mongo
data).  The basic architecture is extensible by means of writing and
configuring arbitrary field override providers.

One concrete implementation of a field override provider is provided
which allows for overrides to be for individual students.  This provider
is then used as a basis for reimplementing the individual due date
extensions feature as a proof of concept for the design.

One can imagine writing override providers that provide overrides based
on a student's membership in a cohort or other similar idea.  This work
is being done, in fact, to pave the way for the Personal Online Courses
feature being developed by MIT, which will use an override provider very
much long those lines.
 2015-04-06 13:04:44 -07:00
Kyle Boots
57d408feae Fix modal close button 2015-04-06 14:28:27 -04:00
Adam
a8bd6dc32d Merge pull request #7570 from edx/adam/bulk-email-changes 
use different queue for smaller emails (TNL-1591)
 2015-04-06 10:01:51 -04:00
Adam Palay
c2e5bd3d98 use different queue for smaller emails (TNL-1591) 2015-04-06 08:13:55 -04:00
Greg Price
7ee640412c Merge pull request #7588 from edx/gprice/debug-toolbar-order 
Move debug toolbar to end of devstack middleware
 2015-04-03 14:39:59 -04:00
Greg Price
8936224437 Move debug toolbar to end of devstack middleware 
The django debug toolbar circumvents other middleware with process_view
functions, so it needs to go at the end of our MIDDLEWARE_CLASSES
setting.

https://django-debug-toolbar.readthedocs.org/en/1.3/tips.html#middleware-isn-t-working-correctly
 2015-04-03 13:50:57 -04:00
Phil McGachey
3f7d637779 [LTI Provider] Adding options to suppress chrome for embedding courseware 2015-04-03 13:23:33 -04:00
Chris Rodriguez
2b9dafeccb Correcting heading levels 2015-04-03 13:21:48 -04:00
Will Daly
645f9c2c7a Add proxy to allow IE9 to make xdomain requests 
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
 2015-04-03 11:41:31 -04:00
Marco Morales
e62e6b4c8e Merge pull request #7562 from edx/marco/dashboard/message-styling-fixes 
Reverts removed styling rule which broke certificate status message on the course dashboard
 2015-04-03 09:39:33 -04:00
Matt Drayer
241133f0ae Merge pull request #7540 from edx/mattdrayer/SOL-462 
Add social sharing feature (Twitter, Facebook) to student dashboard
 2015-04-03 09:18:36 -04:00
louyihua
0d0d1a0ccd Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do 
As some i18n features need ```ugettext``` or its shorcut ```_``` to be called on a non-string-literal, so the pylint check of ```translation-of-non-string``` should be explicitly disabled in such situations.
 2015-04-03 11:59:53 +08:00
Marco Morales
ebdcc3bb6a Add social sharing feature (Twitter, Facebook) to student dashboard 2015-04-02 23:05:13 -04:00
Nimisha Asthagiri
58afd8a7c7 Merge pull request #7541 from edx/mobile/import_fix_course_id 
MA-410 Update video_module import to use target course_id.
 2015-04-02 19:56:04 -04:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release 
Release
 2015-04-02 17:24:50 -04:00
Jesse Zoldak
5b93992ecb Fix trailing whitespace issues 2015-04-02 16:32:22 -04:00
Mark Hoeber
d7eb8cf7e4 Merge pull request #7309 from edx/markhoeber-doc1748 
Platform APIs Doc
 2015-04-02 14:47:10 -04:00
Marco Morales
45b4052860 added clearfix rule back in that was mistakenly removed in earlier styling cleanup 2015-04-02 13:43:27 -04:00
Awais Jibran
037a189828 Merge pull request #7555 from awaisdar001/aj/tnl382-fix-lms-progress-page-invalid-url 
Fixed invalid URL in progress page.
 2015-04-02 22:14:18 +05:00
Nimisha Asthagiri
7e1104c421 MA-410 Update video_module import to use target course_id. 2015-04-02 11:38:01 -04:00
Will Daly
464bcf336e Show certificates for all verified modes 2015-04-02 11:21:54 -04:00
Waheed Ahmed
62a515f038 Fixed static pages removed on import for split course. 
PLAT-484
 2015-04-02 20:14:46 +05:00
Awais Qureshi
4db1753e57 Merge pull request #7530 from edx/aamir-khan/ECOM-912-in-course-reverification 
Aamir khan/ecom 912 in course reverification
 2015-04-02 19:05:08 +05:00
Waheed Ahmed
d9b685d5df Fixed beta tester functionality for ora problems. 
TNL-1736
 2015-04-02 16:51:58 +05:00
Awais Jibran
13e2ecee18 Code refector: Using replaced 'to_deprecated_string' with 'unicode' 2015-04-02 15:30:24 +05:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
Mark Hoeber
b78f25c8d1 Platform API Documentation 2015-04-01 16:04:50 -04:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy 
Add proxy to allow IE9 to make xdomain requests
 2015-04-01 14:18:42 -04:00
MAC
973e3d0306 Fixed invalid URL in progress page. 
TNL-382
 2015-04-01 20:33:35 +05:00
Ahsan Ulhaq
a96acd2f2f iframe elements require a meaningful title attribute 
TNL-1675
 2015-04-01 18:29:55 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests 
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
 2015-04-01 09:16:42 -04:00
Jesse Zoldak
4f8357799d Merge pull request #7539 from edx/jeskew/vertical_ee_test_fix 
Remove mocked has_dynamic_children method.
 2015-04-01 07:35:51 -04:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00