Commit Graph

626 Commits

Author SHA1 Message Date
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button
Show a success button at the top of the Progress page
2014-04-25 16:56:58 -04:00
Adam
1934586afa Merge pull request #3422 from edx/usman/lms2554-tinymce-js
Fixed path of tinymce.js.
2014-04-22 12:31:17 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js.
LMS-2554
2014-04-22 20:41:02 +05:00
Sarina Canelake
f4332bb413 Add new languages from Transifex 2014-04-22 09:48:28 -04:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack,
remove unnecessary code, and clarify what it's doing.
2014-04-08 15:24:48 -04:00
Sarina Canelake
d7f499f276 Don't pull unreviewed languages from Transifex 2014-04-07 13:19:25 -04:00
Filippo Valsorda
1ce7a24572 Make the SHOW_PROGRESS_SUCCESS_BUTTON feature more flexible
The button text default is now in the template and i18n-able, a
PROGRESS_SUCCESS_BUTTON_TEXT_OVERRIDE option is offered in settings.
The button url now uses string formatting.
2014-04-05 18:16:28 +02:00
Filippo Valsorda
da5ab6d222 Add SHOW_PROGRESS_SUCCESS_BUTTON feature
Show a button at the top of lms/templates/courseware/progress.html if the
lowest nonzero grade cutoff has been reached. Introduce two settings:
PROGRESS_SUCCESS_BUTTON_URL is the href of that button (the course id is
appended); PROGRESS_SUCCESS_BUTTON_TEXT is the text, defaults to
"Download your certificate"
2014-04-05 18:13:00 +02:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
David Baumgold
c388b408e1 Merge pull request #3054 from louyihua/fix-chinese-language-name
Fix the chinese name of chinese language in common.py
2014-03-31 13:52:26 -04:00
Sarina Canelake
36185936dd Merge pull request #3130 from edx/sarina/033114-language-update
Update translations (autogenerated message)
2014-03-31 13:43:24 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
Sarina Canelake
6fef664309 Update translations (autogenerated message) 2014-03-31 10:42:17 -04:00
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
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04: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
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -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
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
louyihua
2a658ed8b5 i18n: Fix the chinese name of chinese language
The current version of chinese language's chinese name is not political neutral.
In fact, which form of chinese (traditional or simplified) can be called "正體"(in traditional chinese) or "正体"(in simplified chinese) is not globally defined.
So, I change the name according to the word used by Microsoft Windows, which is more neutral.
2014-03-25 20:35:44 +08: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
William Desloge
d6fd793742 Added ENABLE_MKTG_SITE to Features 2014-03-24 11:29:51 +01: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
Jay Zoldak
1de5e565c3 Kill the perfstats module, which is unused 2014-03-18 15:47:36 -04:00
Sarina Canelake
da6fdc332b Update translations (autogenerated message) 2014-03-15 15:40:08 -04:00
Sarina Canelake
a24d8f2b89 Add new languages 2014-03-12 11:08:02 -04:00
Calen Pennington
31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-03-10 16:21:08 -04:00
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Xavier Antoviaque
73f75f23bb Update import location of prefer_xmodules 2014-03-10 12:01:56 -04:00
Xavier Antoviaque
c3ae0306f1 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-10 12:01:56 -04:00
Han Su Kim
2eaddefb3d Merge pull request #2866 from edx/release
Release Hotfix-03-06-2014
2014-03-07 15:15:57 -05:00
Calen Pennington
6e94919561 Delay import of xmodule packages until after sys.path fixup 2014-03-07 11:46:00 -05:00
Xavier Antoviaque
81cfb6c3bd Update import location of prefer_xmodules 2014-03-07 11:06:06 -05:00
Xavier Antoviaque
bde9513539 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-07 11:06:05 -05:00
John Cox
8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
2014-03-06 17:20:58 -08:00
Xavier Antoviaque
76ae57c7ec Update import location of prefer_xmodules 2014-03-06 18:49:39 -04:00
Xavier Antoviaque
62628f6bd2 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-06 18:23:33 -04:00
Han Su Kim
0db4a899f4 Merge branch 'release' 2014-03-06 16:57:06 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes
Correct misaligned django-cas integration
2014-03-06 16:17:13 -05:00
David Adams
dcb169fb37 Moved CLASS_DASHBOARD setting into the FEATURES dict. 2014-03-05 15:47:23 -08:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router
Dbarch/mixed ms router
2014-03-05 17:17:07 -05:00
Don Mitchell
43df25d42b Point to prefer_xmodules new locn 2014-03-05 14:40:34 -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
Calen Pennington
d101933617 Add course tags to all events where a course-id can be extracted from the url
[LMS-2105]
2014-03-05 13:45:08 -05:00