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

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
e17ba775d4 Merge pull request #2759 from edx/release-and-merge-conflict-resolution 
Release and merge conflict resolution
 2014-02-27 18:03:41 -05:00
marco
1906946db9 adding in gray versions of social icons for use in new email template. Using new name to ensure old links and existing emails using older templates still stay active 2014-02-27 17:33:45 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Sylvia Pearce
556f6bb0a4 Further updates to Polls 2014-02-27 17:07:33 -05:00
Will Daly
fe4be011af Add error notification for XBlocks in Studio 2014-02-27 16:54:19 -05:00
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Calen Pennington
287d84ba95 Fix youtube captions that disappeared with multi-language caption support 
[BLD-889]
 2014-02-27 15:42:19 -05:00
Sarina Canelake
988c814fa3 Merge pull request #2740 from edx/sarina/update-help-modal-language 
Add change for help modal in anticipation of i18n support
 2014-02-27 15:40:25 -05:00
srpearce
c777f9c13c Merge pull request #2755 from edx/sylvia/documentation/BLD-672 
Update video docs for multiple language transcripts
 2014-02-27 15:39:59 -05:00
Sylvia Pearce
c4d0248a73 Add xref to Add Files in Video docs 2014-02-27 15:39:00 -05:00
Frances Botsford
25833471d4 adding a little styling to the language note on the LMS help modal 2014-02-27 15:32:56 -05:00
Andy Armstrong
9cee08ea88 Merge pull request #2539 from edx/andya/nested-xblocks 
Add new container page that can display nested xblocks
 2014-02-27 15:29:57 -05:00
Dave St.Germain
155ed8c665 Display only the first component name in the page (and nav) title. 
STUD-1351
 2014-02-27 15:29:23 -05:00
Sylvia Pearce
a4dde8ad46 Update video docs for multiple language transcripts 2014-02-27 15:25:14 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks 
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
 2014-02-27 14:53:05 -05:00
chrisndodge
7884e49955 Merge pull request #2711 from edx/cdodge/throttle-forgot-password 
add some rate limiting to the password reset functionality
 2014-02-27 14:47:21 -05:00
Chris Dodge
46fa943fc2 fix method name to actually make sense 2014-02-27 13:56:58 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save 
Native XBlock Studio Save UI
 2014-02-27 10:50:51 -05:00
Waheed Ahmed
4db7885336 Students not receiving credit for peer assessment. 
ORA-330
 2014-02-27 10:38:34 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database 
Finalize tests for embargo middleware app
 2014-02-27 10:27:29 -05:00
David Baumgold
a1dbc3bbd6 Start documenting Staff Debug Info 
STUD-1273
 2014-02-27 09:47:11 -05:00
Mark Hoeber
8f7497cfe7 Merge pull request #2747 from edx/markhoeber/documentation/release-notes-update 
Added discussions issue
 2014-02-27 09:40:57 -05:00
Mark Hoeber
11fd9acd4f Added discussions issue 
to delete response comments
 2014-02-27 09:40:25 -05:00
Sarina Canelake
e71bbeb1e2 Tests for embargo middleware feature 2014-02-27 09:33:17 -05:00
Sarina Canelake
f061c00292 Add change for help modal in anticipation of i18n support 2014-02-27 08:57:47 -05:00
Sarina Canelake
4440a85969 Merge pull request #2741 from edx/sarina/update-translations 
Fix password reset i18n
 2014-02-27 08:48:59 -05:00
Sarina Canelake
fe85a1eec1 Django-admin for Embargo feature 
Allows specification of countries to embargo, what course(s) should
apply embargo restrictions, and whitelist/blacklist capability for
specific individual IP addresses.
 2014-02-27 08:38:05 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature 
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
 2014-02-27 08:37:58 -05:00
Valera Rozuvan
074e947ef7 Merge pull request #2690 from edx/valera/add_start_time_end_time_functionality 
Fix start-time functionality in the video player.
 2014-02-27 00:16:10 +02:00
Sarina Canelake
0f0f185f90 Fix password reset i18n 2014-02-26 16:17:42 -05:00
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio 
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
 2014-02-26 16:17:02 -05:00
Mark Hoeber
348ce15f10 Merge pull request #2718 from edx/markhoeber/documentation/release-notes-2-25-14 
Release Notes for 2-26-14
 2014-02-26 16:07:51 -05:00
Mark Hoeber
dea5b55541 Release Notes for 2-26-14 
DOC-36
 2014-02-26 16:07:07 -05:00
chrisndodge
38e55a4eb9 Merge pull request #2668 from edx/cdodge/no-pii-in-logs 
add new feature to make sure we aren't writing PII into the application ...
 2014-02-26 16:04:12 -05:00
Chris Dodge
9431318467 add some rate limiting to the password reset functionality 2014-02-26 16:02:42 -05:00
Greg Price
4516f9e99b Merge pull request #2733 from edx/gprice/forum-pinning-ux 
Improve UX of pinning feature
 2014-02-26 15:28:21 -05:00
Adam
256e13a0af Merge pull request #2739 from edx/release 
Release
 2014-02-26 15:14:28 -05:00
Dave St.Germain
ce596919b4 Merge pull request #2734 from edx/dcs/a11y-course-update-delist 
Tweaks course update html to avoid using list tags inappropriately.
LMS-1724
 2014-02-26 14:01:07 -05:00
Greg Price
29e77ed25f Improve UX of pinning feature 
Students no longer see a tooltip nor any button affordance (i.e. cursor
and color change on hover/focus) on the pinning feature. For moderators,
the tooltip is now correct when a thread is pinned, the button is
accessible for keyboard-only users and screen readers, and an error
dialog now appears if an error occurs in attempting to pin/unpin.

JIRA: FOR-192
 2014-02-26 13:59:54 -05:00
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately. 
LMS-1724
 2014-02-26 13:28:00 -05:00
Ned Batchelder
1fb5c3cc82 Merge pull request #2708 from pdehaye/patch-1 
The correct LTI keyword is "roles", not "role"
 2014-02-26 12:57:34 -05:00
Giulio Gratta
51632a9f0a Merge pull request #2579 from edx/giulio/studio-file-urls 
Internal/External Studio file URLs
 2014-02-26 09:32:59 -08:00
Martyn James
b2039a7839 Merge pull request #2649 from edx-solutions/AddAuthor 
Adding Marty as an author
 2014-02-26 12:29:43 -05:00
Martyn James
9f4cb51d08 Adding Marty as an author 2014-02-26 12:28:05 -05:00
Greg Price
0f38892028 Merge pull request #2701 from edx/gprice/edit-forum-comment 
Add UI for editing forum third-level content
 2014-02-26 11:45:14 -05:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
Jim Abramson
9c791a952c Merge pull request #2706 from edx/jsa/forum-delete-comments-acceptance 
Add acceptance tests for forums comment deletion.
 2014-02-26 11:19:20 -05:00
jsa
bea463d950 Add acceptance tests for forums comment deletion. 
JIRA: FOR-472
 2014-02-26 10:31:02 -05:00
jsa
7be356b390 auto_auth: add ability to configure forum roles and scrape user id. 2014-02-26 10:30:55 -05:00
Alexander Kryklia
331a94c124 Allow /static in transcript names. 2014-02-26 10:05:34 -05:00