Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,688 Commits 1 Branch 0 Tags
17841fcdd486008d71d1cf0406d4690ac739ffe8
Commit Graph

8662 Commits

Author SHA1 Message Date
Carson Gee
87fa6cc753 Check if user is anonymous before calling PSYCHOMETRICS 
LTI grade callbacks for example, come in with an anonymous user.  This causes a
stack trace in the psychometrics app that leads to the LTI service
getting a 404.  This adds a check before that callback gets registered.
 2014-08-01 12:34:12 -04:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Greg Price
b10c4b146f Merge pull request #4599 from Stanford-Online/u/forum/upload-file-size 
Fix incorrect max upload file size on forums
 2014-07-31 10:31:16 -04:00
Renzo Lucioni
ab067046e3 Fully rename instructor dashboard analytics app 2014-07-31 09:45:44 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
Ben Patterson
2848f7ab58 Merge pull request #4597 from edx/benp/fix-bok-choy-solano 
Simplify bok choy environments to inherit pipeline settings from common.
 2014-07-30 12:16:45 -04:00
stv
510c130c1a Fix incorrect max upload file size on forums 
The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] 5d90366917
 2014-07-29 12:18:22 -07:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul" 
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
 2014-07-29 17:41:46 +00:00
Ben Patterson
90a2417d97 Simplify bok choy environments to inherit pipeline settings from common.py 2014-07-29 11:40:21 -04:00
Juanan Pereira
cb2aaf8d8c set keyboard input focus to the e-mail field on the login screen 2014-07-29 00:31:26 +02:00
Ned Batchelder
7f9839b990 Merge pull request #4492 from edx/ned/poweredby-logos-on-cdn 
Use the CDN-friendly URLs for the Powered-By logos
 2014-07-28 15:33:41 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir 
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
 2014-07-28 21:52:20 +05:00
Usman Khalid
c770f6e753 Merge pull request #4556 from edx/usman/lms11146-download-csv-of-responses 
In legacy dashboard changed make_usage_key() to make_usage_key_from_deprecated_string()
 2014-07-28 21:46:35 +05:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul 
Overhaul Segment.io integration
 2014-07-28 11:59:58 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Ned Batchelder
41ed2db720 Use the CDN-friendly URLs for the Powered-By logos 2014-07-28 10:20:22 -04:00
Ned Batchelder
7caf8c53b1 Merge pull request #4080 from Course-Master/redirect 
decode uri component before redirect for safe redirect
 2014-07-28 10:14:45 -04:00
Ben Patterson
4f34029b43 Simplify acceptance test env settings for pipeline handlers. 
It will now inherit from common settings.
 2014-07-28 07:53:49 -04:00
Usman Khalid
e0d6ee705b In legacy dashboard changed make_usage_key() to make_usage_key_from_deprecated_string(). 
LMS-11146
 2014-07-28 16:26:26 +05:00
Oleg Marshev
46fe356182 Use data dir from course. 2014-07-28 13:11:12 +03:00
Calen Pennington
48645020d1 Merge pull request #4392 from louyihua/lms-window-origin 
Add defininition of window.location.origin in both studio and LMS
 2014-07-25 14:27:27 -04:00
John Jarvis
9016aa9854 Merge pull request #4558 from edx/jarv/remove-syslog-addr 
removing syslog_addr
 2014-07-25 11:00:59 -04:00
John Jarvis
5b686f9bdf removing syslog_addr 
This is not currently being used in production and will not
be used moving forward since logs are remoted using splunk
 2014-07-25 10:43:58 -04:00
Ned Batchelder
fec283366f Fix the decoding of ?next= 2014-07-24 16:11:43 -07:00
Ned Batchelder
dea5c7d3db Add a test of login with params on the next URL 2014-07-24 16:11:33 -07:00
Ned Batchelder
533e072677 A debug view for seeing the URL params 2014-07-24 16:11:20 -07:00
Ned Batchelder
d9bb2868e8 Add a view that can show us what URL params we got 2014-07-24 16:10:56 -07:00
Anurag Ramdasan
f77c06ff1f check if next is not defined 2014-07-24 16:10:44 -07:00
Anurag Ramdasan
c4fa475c7a add var declaration for next 2014-07-24 16:10:36 -07:00
Anurag Ramdasan
4df0efa250 decode uri component before redirect for safe redirect 2014-07-24 16:10:01 -07:00
Kevin Luo
9b3b2e72a2 Add support for theme translations and LANGUAGE_DICT override 2014-07-24 04:39:38 -07:00
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
chrisndodge
e9f2801cef Merge pull request #4479 from edx/muhhshoaib/Ex-40-Coupon-discount-value-add-validation 
Fixed the  discount value bug
 2014-07-21 21:48:56 -04:00
Jason Bau
bd03741c79 Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page 
Ndupoux/fixing registration page
 2014-07-21 18:07:10 -04:00
Sarina Canelake
6be3384481 Merge pull request #4431 from edx/split/get_wiki_courses 
Split get_courses_for_wiki impl
 2014-07-21 17:59:19 -04:00
marcotuts
c7d88deb47 Merge pull request #4453 from edx/marco/dashboard-styling-tweaks 
Visual styling adjustments to profile area on Course Dashboard
 2014-07-21 17:50:04 -04:00
Sarina Canelake
d0449cdff2 get_courses_for_wiki return course_keys across all modulestores [LMS-2914] 2014-07-21 17:17:48 -04:00
njdup
770e7aac49 User registration prevents using password as username. 
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
 2014-07-21 14:04:48 -07:00
Ned Batchelder
feac1e0b60 Merge pull request #4498 from IONISx/tusbar/fix-dump-grades-unicode 
Fix unicode issue
 2014-07-21 16:10:46 -04:00
Ned Batchelder
00377652e4 Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title 
Remove course ID from title in course about page
 2014-07-21 13:57:34 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Bertrand Marron
602988c39a Fix unicode issue 2014-07-21 16:43:51 +02:00
Muhammad Shoaib
2d41ebe48f removed the discount value bug 
check error handling if the discount value is not an integer
 2014-07-21 09:12:57 -04:00