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

7879 Commits

Author SHA1 Message Date
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
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things 
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
 2014-03-24 16:57:56 -04:00
Adam
8aaabd7461 Merge pull request #3041 from edx/adam/fix-data-download 
fix typo in data download tab (LMS-2441)
 2014-03-24 14:43:58 -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
Sarina Canelake
4398443fe8 Merge pull request #3036 from edx/sarina/032414-language-update 
032414 Language update
 2014-03-24 13:22:46 -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
76a2ac9833 Add Malaysian, Catalan languages 2014-03-24 12:18:25 -04:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget 
LMS-2262
 2014-03-24 12:16:41 -04:00
Adam Palay
f1c19d02d7 fix typo in data download tab (LMS-2441) 2014-03-24 12:00:38 -04:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade 
Upgrade TinyMCE and switch to CodeMirror plugin
 2014-03-24 11:53:17 -04:00
David Baumgold
e55bca6bf1 Merge pull request #3023 from edx/db/unicode-server-error-page 
Unicode strings for server error page
 2014-03-24 11:24:02 -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
Sarina Canelake
c2933d9221 i18n Inst Dash pending tasks table 
LMS-2357
 2014-03-21 17:49:13 -04:00
Sarina Canelake
7cf093606c i18n Inst Dash Email tab 
LMS-2357
 2014-03-21 17:49:13 -04:00
Sarina Canelake
8dd1210cfc i18n Inst Dash Analytics tab 
LMS-2357
 2014-03-21 17:49:12 -04:00
Sarina Canelake
71931bcf0f i18n Inst Dash Membership tab 
LMS-2357
 2014-03-21 17:49:12 -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
3bcf619f0d Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2 
Frances/feature/studio nav manipulation2
 2014-03-21 15:13:22 -04:00
David Baumgold
91e120eea0 Unicode strings for server error page 2014-03-21 14:50:55 -04:00
cahrens
ffbba2ba0c Update tinymce paths. 2014-03-21 14:41:59 -04:00
cahrens
6c1d369b71 Remove unused testing templates and unused tabs. 2014-03-21 14:41:59 -04:00
cahrens
0ddc3a6556 Changes to support Bulk e-mail usage. 2014-03-21 14:41:56 -04:00
Carson Gee
767feb9396 Merge pull request #2948 from carsongee/cg/cas_attribute_callback 
Adding ability to give an attribute callback for CAS
 2014-03-21 14:26:49 -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
Valera Rozuvan
55b0fd08e7 Merge pull request #3011 from edx/valera/delete_old_files 
Removed unused code that is over 2 years old.
 2014-03-21 16:45:26 +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
Valera Rozuvan
7e9ebb09a0 Removed unused code that is over 2 years old. 2014-03-21 13:29:51 +02: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
Dave St.Germain
3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header 
Remove course name from page H1, and slightly improve sequence navigation
 2014-03-20 14:07:32 -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
Brian Talbot
385880d8ec Merge pull request #2989 from edx/talbs/fix-lms-contentbackground 
FIX - LMS: Courseware Content Background Color/Height in IE
 2014-03-20 10:38:15 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds 
a page level javascript SR object to enable reading of alert messages.
LMS-2158
 2014-03-20 09:53:44 -04:00
Usman Khalid
021e6f5b45 Merge pull request #2970 from edx/usman/lms2194-discussion-forum-unicode-error 
Replaces print statement in django_comment_client with unicode log.debug.
 2014-03-20 17:36:57 +05:00
Waheed Ahmed
c8797ac204 Merge pull request #2966 from edx/waheed/lms2346-fix-assigning-forum-roles-beta-membership-tab 
Fixed assigning forum roles from beta dashboard membership.
 2014-03-20 16:24:59 +05:00
jmclaus
f2489d141c Removed tooltip from captions. [BLD-629] 2014-03-20 10:24:27 +01:00
Waheed Ahmed
bb26fa0cd0 Fixed assigning forum roles from beta dashboard membership. 
LMS-2346
 2014-03-20 11:38:43 +05:00