Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,658 Commits 1 Branch 0 Tags
373244b094befbbdf55cc2bdc8f0e90ff22fbd26
Commit Graph

3282 Commits

Author SHA1 Message Date
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo 
Fixed all instances of "occured" typo
 2014-01-27 10:46:13 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Joe Blaylock
e263b33f17 Merge pull request #2227 from edx/jrbl/fix_cert_whitelist_report 
Certs - bugfix cert_whitelist output
 2014-01-24 15:11:37 -08:00
Joe Blaylock
6a2fbf7175 Merge pull request #2290 from edx/jrbl/mdx_stop_printing 
Eliminate unused import and gratuitous prints
 2014-01-24 14:24:24 -08:00
Chris Dodge
8262b6564e pep8 cleanup 2014-01-24 11:59:56 -05:00
chrisndodge
88391c7ec6 Merge pull request #2278 from edx/cdodge/session-inactivity-timeout 
add middleware to be able to expire inactive sessions after N seconds
 2014-01-24 08:25:24 -08:00
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds 
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
 2014-01-24 10:36:21 -05:00
Usman Khalid
c296498806 Merge pull request #2291 from edx/usman/fix-openended-post-command-tests 
Fixed flaky test for instructor command openended_post.
 2014-01-24 06:12:09 -08:00
Usman Khalid
e0ecf011bd Fixed flaky test for instructor command openended_post. 
The submission time is serialized into json and sent to xqueue. Previously the
whole json body argument to send_to_queue() was being matched. Sometimes the
time calculated in the test would differ slightly from the time calculated in
send_to_grader() and the test would fail. This fix tests individual fields of
the body argument to mock_send_to_queue() instead.
 2014-01-24 18:35:25 +05:00
Oleg Marshev
ec6d9d585a Allow user with BetaTester role correctly use LTI. BLD-641. 2014-01-24 14:42:14 +02:00
Anton Stupak
dfc474178e Merge pull request #2230 from edx/anton/store-video-state 
Persist speed preferences between videos.
 2014-01-23 23:26:54 -08:00
Joe Blaylock
9c803825ff Eliminate unused import and gratuitous prints 2014-01-23 16:12:18 -08:00
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02:00
Jason Bau
d9f98b84b7 Merge pull request #2226 from edx/jbau/resubscribe-notifer 
resubscribe feature for notifier
 2014-01-23 10:29:00 -08:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields 
Merge "video sources" and "download video" into the same field
 2014-01-23 09:31:11 -08:00
Jay Zoldak
538ecf4852 Enable microsite tests 
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
 2014-01-23 10:42:51 -05:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Carson Gee
ef8671ad7e Merge pull request #2263 from carsongee/cg/gitlog_course_not_found_exception 
Correct exception raising bug for non global staff accessing missing course git logs
 2014-01-22 12:25:58 -08:00
Carson Gee
f688fd319c Merge pull request #2262 from carsongee/cg/improved_git_import_debug_logging 
Add additional logging for importing course from git
 2014-01-22 12:12:50 -08:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript 
Allows students to download the transcript of the video without timecodes
 2014-01-22 12:03:41 -08:00
Carson Gee
7d86124586 Add additional logging for importing course from git 2014-01-22 14:22:06 -05:00
Carson Gee
3aecac7adb Correct exception raising bug for non global staff accessing missing course git logs 2014-01-22 14:03:06 -05:00
Jason Bau
dfacbbdd69 Notifier re-subcribe via link 
* fix assertPrefValid in tests to decrypt instead of compare
* rename unsubscribe -> set_subscribe
 2014-01-22 09:54:27 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images 
Fix non-ascii course image names
 2014-01-22 07:50:13 -08:00
Diana Huang
5a16817e3c Remove authority name from url. 2014-01-22 10:05:17 -05:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Greg Price
f5bdec8ae9 Merge pull request #2204 from edx/gprice/mustache-i18n 
Internationalize forums mustache templates
 2014-01-21 13:49:41 -08:00
Greg Price
f75a7e08cd Internationalize forums mustache templates 2014-01-21 15:57:57 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release 
Merging Release 2014-01-21
 2014-01-21 12:41:05 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic 
Detached categories don't access control on date
 2014-01-19 08:46:28 -08:00
Jason Bau
8abfdc6309 add undo (resub) to landing page of forum unsub link 2014-01-17 18:07:33 -08:00
Joe Blaylock
300501b138 Certs - bugfix cert_whitelist output 
* output after cert_whitelist -a or -d purported to be the whitelist entries
  for the requested course, but in fact were all of the entries in every
  course. This commit fixes that.
 2014-01-17 17:43:09 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting 
one more faulty login regarding ENABLE_MKTG_SITE=true situations
 2014-01-16 17:04:17 -05:00
David Ormsbee
77a315c6a3 Minor data collection tweaks after examining prod course data. 
Add in unicode handling for names.
 2014-01-16 17:03:15 -05:00
Diana Huang
2b6651529a Add in test to test the transactions when we hit an unexpected error. 
Add tests for various error mail sending scenarios
 2014-01-16 17:03:15 -05:00
David Ormsbee
cc1d796b73 Add email send error checking. 
Add manual transaction handling.

Remove grandfather option
 2014-01-16 17:03:15 -05:00
Diana Huang
fdf531aec0 Migrations for LinkedIn. 
Clean up common.

Add the ability to dry-run the command without sending e-mail.

Don't save courses sent during a dry run

Switch to EmailMessage for LinkedIn so we can send HTML emails

Update subject copy.

Use correct name for CertificationName

Fix up certificate url information.
 2014-01-16 17:03:15 -05:00
David Ormsbee
db7308adc1 Remove unused parts of LinkedIn API 
Fix whitelist logic to handle empty lists.
 2014-01-16 17:03:15 -05:00
Diana Huang
f37001275a Clean up the e-mail settings. 2014-01-16 17:03:15 -05:00
Diana Huang
a3f1f6600d Integrate new LinkedIn e-mail template 2014-01-16 17:03:15 -05:00
David Ormsbee
a18bce81f2 Basic cleanup of code to determine whether a user has a LinkedIn account. 2014-01-16 17:03:15 -05:00
Chris Rossi
1a5eb086c9 Remove stray 'I' from generated URL. 2014-01-16 17:03:15 -05:00
Chris Rossi
33f7611341 It looks like LinkedIn pfCertFuture as the date a certificate expires. 
We were using to indicate the date a course ended.  Better to remove it,
since edX certificates don't really expire.
 2014-01-16 17:03:14 -05:00
Chris Rossi
c2651497a2 Pylint 2014-01-16 17:03:14 -05:00
Chris Rossi
f286296568 pep8 2014-01-16 17:03:14 -05:00
Chris Rossi
c5c9554dbc Test LinkedinAPI 2014-01-16 17:03:14 -05:00