Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,098 Commits 1 Branch 0 Tags
24756bdbea67e525d179db7e7b80574f1a4e29d6
Commit Graph

8192 Commits

Author SHA1 Message Date
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00
Adam
7d6e3319eb Merge pull request #3595 from edx/adam/fix-typo-2 
put google analytics in quotation marks in linkedin email template
 2014-05-12 17:10:41 -04:00
Carson Gee
f247adc4b7 Merge pull request #1 from edx/ned/tweaks-for-pr-3464 
Simple fixes
 2014-05-12 16:37:51 -04:00
Ned Batchelder
2f7adda00d Simple fixes 
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
 2014-05-12 15:52:57 -04:00
Greg Price
d9817117ed Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields 
Allow extra fields returned from comments service
 2014-05-12 14:42:26 -04:00
Greg Price
57f14bded1 Allow extra fields returned from comments service 
Previously, an error was raised if the comments service returned data
including an unexpected field, which unnecessarily complicated the
release path for new features, since the list of allowed fields would
need to be modified before cs_comments_service could be modified, and
only then could edx-platform take advantage of the new CS feature. We
still log a warning if an unexpected field is returned, so we will
still be able to tell if the CS returns a corrupt response.

JIRA: FOR-180
 2014-05-12 13:49:24 -04:00
Carson Gee
ff1564382d Corrected test names and doc strings 2014-05-12 13:41:23 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org 
LMS-1296
 2014-05-12 12:42:19 -04:00
Frances Botsford
b90f1e41e5 UI cleanup of new instructor dashboard 
Stylize warning banners; more UI touches for the intructor dash:
clean up nav structure, compact header so content is higher on the page

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
bc0c13828f Add segment.io tracking for legacy instructor dashboard 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard 
Fix acceptance and unit tests

LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash 
LMS-1296
 2014-05-12 10:18:28 -04:00
Sarina Canelake
c224fe57ef Add banners to the instructor dashboard 
Notification banner to default dash to announce the change

Warning banner on legacy instruction dashboard to explain it has been deprecated

LMS-1296
 2014-05-12 10:18:27 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash 
LMS-1296
 2014-05-12 10:18:27 -04:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Carson Gee
74578cd720 Merge pull request #3493 from carsongee/cg/sysdash_git_info 
Adding additonal path to search for git information on sysadmin dashboard
 2014-05-09 15:14:10 -04:00
Sarina Canelake
193a816395 Merge pull request #3609 from edx/sarina/i18n-cleanup 
Clarify strings for i18n
 2014-05-09 15:00:36 -04:00
Carson Gee
cbf525f6cf Fix infinite redirect loop on logout caused by django caching 2014-05-09 14:22:11 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug 
add problem reset link to staff debug page
 2014-05-09 13:29:29 -04:00
Carson Gee
7c1e6d83e4 Fix message handling to be more internationalizable 2014-05-09 11:21:39 -04:00
Greg Price
8f90dd835d Merge pull request #3653 from edx/gprice/discussion-link-command 
Add command to get discussion_link for a course
 2014-05-09 10:34:45 -04:00
Sarina Canelake
81a8bc39f6 Clarify strings for i18n 2014-05-09 10:23:46 -04:00
muhammad-ammar
50a99de6e1 Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6 
Bok-Choy Video Tests Batch6
 2014-05-09 18:31:04 +05:00
Waheed Ahmed
40a03ebb79 Redirected to dashboard if course mode is none. 
LMS-2617
 2014-05-09 15:34:26 +05:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Greg Price
5e849bfb76 Add command to get discussion_link for a course 
This will be used to detect courses that are linking to Stack Exchange
sites so we can handle them specially when generating data dumps.
 2014-05-08 17:40:13 -04:00
Carson Gee
c23a05b50d Merge pull request #3213 from carsongee/cg/video_transcript_static 
Add static fallback method for video transcripts
 2014-05-08 11:51:04 -04:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -04:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Carson Gee
2998a2e9b7 Code review changes 
i18n
 2014-05-07 16:16:37 -04:00
Carson Gee
c0644dc984 Only do static transcript redirect for english language, and don't offer static redirect for download 
Rename video test to real YouTube-ID
 2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e Add last resort method to download and showing of video transcript 2014-05-07 15:11:41 -04:00
Giulio Gratta
6963d24e5d Merge pull request #3597 from caesar2164/giulio/help-modal-features 
Changes for Help Modal to work on Stanford Site
 2014-05-07 10:32:22 -07:00
Ned Batchelder
5e34c21ff4 Merge pull request #3628 from edx/ned/fix-ignorable-404-ends 
IGNORABLE_404_ENDS is wrong and unused
 2014-05-07 11:17:05 -04:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused 
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
 2014-05-06 18:02:53 -04:00
Ned Batchelder
e25bbde4f2 Merge pull request #3618 from edx/ned/remove-press-stories 
Remove press-page machinery and assets
 2014-05-06 17:35:21 -04:00
Giulio Gratta
ba6b0cf4e7 Changes for Help Modal to work on Stanford Site 
- moved zendesk endpoint to new condition
- some help modal styling
 2014-05-06 12:06:04 -07:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd 
Drag and drop on container page
 2014-05-06 11:09:29 -04:00
Usman Khalid
bbbfc33e34 Merge pull request #3552 from edx/usman/lms2565-bulk-email-display 
When sending bulk email check if course is authorized.
 2014-05-06 17:01:02 +05:00
Han Su Kim
6579364f85 Merge pull request #3593 from edx/han/cert-report 
Certificate report improvements
 2014-05-05 15:01:58 -04:00
Han Su Kim
8bcb70b8bf Filter just downloadable certs for report 2014-05-05 13:45:07 -04:00
Han Su Kim
4b49159205 Adding additional fields for certificate mode 2014-05-05 13:20:36 -04:00
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus 
LMS: Show Enrollment Type on Dashboard
 2014-05-05 13:19:49 -04:00
Adam Palay
3804bb1f8f put google analytics in quotation marks in linkedin email template 2014-05-05 12:08:36 -04:00
Carson Gee
e311dfa847 Adding additonal path to search for git information on sysadmin dashboard 
When viewing the sysadmin dashboard courses tag, we also search the git
repository directory in addition to the DATA_DIR to try and find
the course git repo to get hash, last commit, and last editor information
for each loaded course if available.
 2014-05-05 12:03:18 -04:00
Han Su Kim
36865b8447 flake8 cleanup 2014-05-05 11:31:39 -04:00