Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,552 Commits 1 Branch 0 Tags
371ecb08e87f0ded187d5ae9f1e36bf642e3b98c
Commit Graph

21552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
371ecb08e8 Better sorting of stores for get_courses 
May apply to all store ordering
 2014-03-05 14:40:34 -05:00
Don Mitchell
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -05:00
Don Mitchell
f371c4f5ae Pass user id to update_item 2014-03-05 14:40:34 -05:00
Don Mitchell
c9285de433 unicode correctly and understandably 2014-03-05 14:40:33 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD 
STUD-600
 2014-03-05 14:32:56 -05:00
Dave St.Germain
a1dc347c1a Merge pull request #2767 from edx/dcs/a11y-forgot-a-label 
Add label to the checkboxes sample template.
 2014-02-28 14:19:16 -05:00
chrisndodge
38916f8528 Merge pull request #2713 from edx/cdodge/add-auth-to-wiki 
add some authorization checks to the Wiki
 2014-02-28 14:15:59 -05:00
Chris Dodge
10465e3eb0 add some authorization checks to the Wiki 2014-02-28 13:36:18 -05:00
Dave St.Germain
a8a20a6a5c Merge pull request #2638 from edx/dcs/ui-confirm-dialog 
Converted javascript confirmation dialog on essay grader to modal dialog
 2014-02-28 13:34:45 -05:00
Dave St.Germain
fd59de346b Converted javascript confirmation dialog to jquery UI dialog (needs style) 2014-02-28 13:32:39 -05:00
Dave St.Germain
0a73326bca Merge pull request #2770 from edx/dcs/mat-4 
Update django-wiki revision
fixes MAT-4
 2014-02-28 13:18:56 -05:00
Dave St.Germain
7126a2283d Update django-wiki revision 2014-02-28 13:18:19 -05:00
Will Daly
481344cbb6 Merge pull request #2757 from edx/will/studio-xblock-error-notification 
Add error notification for XBlocks in Studio
 2014-02-28 11:52:37 -05:00
Dave St.Germain
9826a2f19e Add label to the checkboxes sample template. 2014-02-28 11:25:42 -05:00
srpearce
c5439de160 Merge pull request #2764 from edx/sylvia/documentation/BLD-672 
Fix typo
 2014-02-28 09:47:32 -05:00
Sylvia Pearce
35d5d11113 Fix typo 2014-02-28 09:46:43 -05:00
David Baumgold
837a1d79fa Merge pull request #2748 from edx/db/document-staff-debug-info 
Start documenting Staff Debug Info
 2014-02-28 09:04:16 -05:00
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
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
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
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