Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,194 Commits 1 Branch 0 Tags
d5bb1b5cca96ff15fa284e215fefb7026a5d3d21
Commit Graph

3516 Commits

Author SHA1 Message Date
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Valera Rozuvan
34ac619086 Addressing comments. 2014-03-31 14:47:11 +03:00
Valera Rozuvan
4610bd1b18 Add acceptance test for blocked YouTueb API with HTML5 sources 
When the video has both YouTube IDs and HTML5 sources, and
the YouTube API is blocked, then HTML5 sources should be
used.
 2014-03-31 14:47:11 +03:00
Waheed Ahmed
f748173b60 Merge pull request #3086 from edx/waheed/fix-lagacy-dash-numeric-placeholders 
Fixed legacy dash numeric placeholders with named.
 2014-03-31 14:49:18 +05:00
Waheed Ahmed
375c206a2b Fixed lagacy dash numeric placeholders with named. 2014-03-31 12:06:31 +05:00
Waheed Ahmed
eb9133aeb6 Open ended panel headings not internationalized. 
LMS-2169
 2014-03-31 11:25:10 +05:00
Carlos Andrés Rocha
7d618f26ca Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/features/video.feature
 2014-03-29 20:37:49 -04:00
Valera Rozuvan
a4f6a67f0f Adding acceptance test for multiple videos. 
Part of BLD-972.
 2014-03-30 00:14:32 +02:00
Calen Pennington
bb2508aca4 Merge pull request #3062 from cpennington/comment-client-metrics 
Add metrics to comment_client requests
 2014-03-28 16:34:24 -04:00
Calen Pennington
f4e55ccb76 Merge pull request #3061 from cpennington/model-metrics 
Add datadog metrics logging for django model creates, updates, and deletes
 2014-03-28 16:33:53 -04:00
Jay Zoldak
748fc120cd Disable failing video test 2014-03-28 16:20:04 -04:00
Jay Zoldak
1532badfe5 Skip video test that is failing in master 2014-03-28 15:01:29 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
Gabe Mulley
05d959bc09 Merge pull request #3089 from mulby/gabe/publish 
Support emitting analytical events from xblocks running in the LMS
 2014-03-28 13:58:52 -04:00
Calen Pennington
ec1b056d82 Use requests library utility method for getting json results 2014-03-28 11:37:43 -04:00
Calen Pennington
d4db0ee7e4 Remove unused methods from comment_client 2014-03-28 11:37:43 -04:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard 
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
 2014-03-28 11:10:14 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes 
Unicode support fixes
 2014-03-28 20:08:27 +05:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Gabe Mulley
d6052675da Support emitting analytical events from xblocks running in the LMS 
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change.

Fixes: AN-789
 2014-03-27 18:50:46 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Adam
2e174f2aa7 Merge pull request #3070 from edx/adam/middleware 
wiki middleware fix (LMS-2461)
 2014-03-26 16:36:17 -04:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps. 
LMS-2429
 2014-03-26 18:57:02 +05:00
Waheed Ahmed
62fdf33c6f Merge pull request #2938 from edx/waheed/lms2167-show-submission-history-not-internationalized 
Internationalized submission history view.
 2014-03-26 18:31:41 +05:00
polesye
a1c957ecd3 BLD-951: Fix flaky tests. 2014-03-26 11:45:17 +02:00
Waheed Ahmed
94af663683 Submission history view not internationalized. 
LMS-2167
 2014-03-26 13:14:02 +05:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase 
Install new ORA (edx-tim)
 2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
Sarina Canelake
2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262 
More helpful UX in beta membership widget
 2014-03-24 13:24:01 -04:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace. 
All YouTube urls are defined on backend side.
 2014-03-24 18:40:28 +02:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget 
LMS-2262
 2014-03-24 12:16:41 -04:00
Sarina Canelake
ca6850284d Merge pull request #3020 from edx/sarina/LMS-2357 
Finish i18n of beta instructor dashboard
 2014-03-24 09:11:24 -04:00
polesye
bd4be00ae4 BLD-534: Add acceptance test. 2014-03-24 08:47:12 +02:00
Jay Zoldak
a00007b837 Merge pull request #3024 from edx/zoldak/update-se-version 
Update selenium version
 2014-03-22 07:45:02 -04:00
Sarina Canelake
454da6fefc i18n Inst Dash enrolled students profile table 
LMS-2357
 2014-03-21 17:49:13 -04:00
Joe Blaylock
1fe68fafa2 Merge pull request #2530 from edx/jrbl/certs_regen_handy_flags 
Certificates: Additional flags for regenerate_user
 2014-03-21 14:36:25 -07:00
Jay Zoldak
cd81b5aa2b Temporarily disable video autoplay selenium tests 2014-03-21 15:47:24 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio 
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
 2014-03-21 13:58:01 -04:00
Usman Khalid
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions 
Catch module render exceptions
 2014-03-21 21:12:30 +05:00
Valera Rozuvan
8474336a3d Commenting out flaky acceptance tests. 2014-03-21 17:46:49 +02:00
Valera Rozuvan
b54a268fba Merge pull request #3014 from edx/valera/comment_out_failing_acceptance_test 
Commenting out a flaky acceptance test.
 2014-03-21 17:24:34 +02:00
Valera Rozuvan
bfee966cfe Commenting out a flaky acceptance test. 2014-03-21 16:51:44 +02:00
zubair-arbi
5b3a08ddcc Merge pull request #2925 from edx/zub/bugfix/std1433-importunicodename 
use unicode strings for slug and regex
 2014-03-21 19:01:26 +05:00
Anton Stupak
ce7e7740c4 Merge pull request #3001 from edx/anton/fix-flaky-acceptance-test 
Video: Fix flaky acceptance test.
 2014-03-21 14:03:45 +02:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment 
Simple email checking for batch enrollment on inst dash
 2014-03-21 07:45:09 -04:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
polesye
f3f1aa2943 Fix acceptance test. 2014-03-21 10:46:50 +02:00
Sarina Canelake
066d04f595 Simple email checking for batch enrollment on inst dash 
LMS-2244
 2014-03-20 15:58:19 -04:00
Jay Zoldak
b695bceeeb Merge pull request #2997 from edx/zoldak/fix-pragma-pep8 
Fix pylint disable pragmas that were pep8 violations
 2014-03-20 13:56:00 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00