Commit Graph

1087 Commits

Author SHA1 Message Date
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Nimisha Asthagiri
e9db4ad16d LMS-11019 Add feature flag to create Split Course 2014-08-07 18:07:01 -04:00
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting)
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
2014-08-07 09:30:51 +02:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
2014-08-04 12:17:45 -07:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
2014-07-28 21:52:20 +05:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course
STUD-1725
2014-07-21 13:16:00 +05:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Usman Khalid
682e3108a8 Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
Currently a new temp directory is created for every process via
mkdtemp_clean() which cleans it on process exit.

However, this is not compatible with using --preload option of
gunicorn. With this option the tmp directory is created on gunicorn
start and is shared by all the workers. But when a worker exits it
deletes the directory. And so on the next requent the tmp directory
needs to be recreated and the templates need to be recompiled.

LMS-6507
2014-07-15 17:37:23 +05:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service
Updating settings and requirements for platform to support file upload
2014-07-14 09:22:40 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default
Add filter to only show first occurance of DepWarning
2014-07-11 15:40:09 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs
LMS-2651
2014-07-09 21:51:37 +00:00
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Adam Palay
826aa4554c removes qualaroo from studio (STUD-1684) 2014-05-30 10:05:35 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions
Extended Embargo feature to support site access restriction and ip network
2014-05-21 15:24:07 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466"
This reverts commit 59e3cae4c9.
2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
2014-05-06 18:02:53 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Nimisha Asthagiri
dd3c8c268c Support for Duplicate and Delete of XBlock Container Leaves (disabled under Feature Flag). 2014-04-10 21:22:15 -04: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
Brian Talbot
473ed4cc89 Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview
Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).

Add the TinyMCE font file to the CMS pipeline.
2014-04-02 11:12:34 -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
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
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
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
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
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Dave St.Germain
aaf4515ac3 remove old version of codemirror, to prevent confusion 2014-03-10 09:43:56 -04: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
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05: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