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

7898 Commits

Author SHA1 Message Date
Calen Pennington
d4db0ee7e4 Remove unused methods from comment_client 2014-03-28 11:37:43 -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
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -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
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver 
Paver v3
 2014-03-26 13:41:05 -04:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE. 
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
 2014-03-26 11:06:59 -04:00
louyihua
0316f3b758 i18n: make emails in lms translatable 
The email texts in lms/templates/emails are not extracted by rake i18n:generate because the babel_mako.cfg does not include them.
And a several emails are not translatable because they do not use ugettext.
 2014-03-26 22:33:21 +08: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
David Baumgold
4801b4b392 Merge pull request #3060 from edx/db/display-error-pages 
Display error page templates, for testing purposes
 2014-03-25 15:36:51 -04:00
David Baumgold
f5f7b77d4e Display error page templates, for testing purposes 
This commit allows us to test the server error template by visiting `/500`. This
way, we can catch errors in our error templates, instead of having infinitely
recursing errors.
 2014-03-25 14:55:14 -04:00
David Baumgold
64265ee58a Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing 
Added ENABLE_MKTG_SITE to Features
 2014-03-25 13:22:28 -04:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04: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
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
William Desloge
d6fd793742 Added ENABLE_MKTG_SITE to Features 2014-03-24 11:29:51 +01: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