Commit Graph

34811 Commits

Author SHA1 Message Date
Eric Fischer
2b2f6d18d6 Wait for text to appear
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
2016-01-20 14:08:13 -05:00
Douglas Hall
73f311f1f6 Merge pull request #11270 from edx/douglashall/TNL-4046/fix_lti_consumer_due_date_comparison_bug
TNL-4046 Updating xblock-lti-consumer requirement to pull in bug fix
2016-01-20 13:59:16 -05:00
Diana Huang
ea2a0cab27 Merge pull request #11069 from OmarIthawi/edraak/oithawi/draggable-capa-rtl
Fixup: draggable capa icons disappear in RTL layout
2016-01-20 13:32:56 -05:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization
Fix (un)enrollment email default language
2016-01-20 13:15:30 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards
Benp/9 bokchoy shards
2016-01-20 12:09:53 -05:00
Régis Behmo
5fee7480e9 Fix (un)enrollment email default language
When one or many users are sent an enrollment or unenrollment email via
the teacher subscription form, the emails are written in the user
language. If the user has no preferred language, e.g: when the user does
not exist, the platform language is supposed to be selected. In
practice, the emails were not being translated at all.
2016-01-20 17:30:43 +01:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg
Escape Course Name in enrolment message
2016-01-20 20:04:23 +05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event
Avoid emitting play_video event during buffering
2016-01-20 17:59:04 +05:00
Matt Drayer
68d770116b Merge pull request #11262 from edx/saleem-latif/WL-276
WL-276: Move microsite_configuration/templatetags/microsite.py from individual templates to static_content.html
2016-01-20 07:49:36 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Saleem Latif
6c8c67cad5 Remove microsite_configuration/templatetags/microsite.py references from individual templates. 2016-01-20 14:36:07 +05:00
raeeschachar
536ac77af0 Merge pull request #11263 from edx/raees/chrome-bokchoy-test-course-rerun
Fixed test course rerun failing on Chrome
2016-01-20 12:39:54 +05:00
Braden MacDonald
f8f9689d5b Merge pull request #11230 from open-craft/omar/saml-crawl-fix
Redirect to login when SAML accessed without idp param
2016-01-19 19:47:50 -08:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
2016-01-20 09:36:31 +07:00
Ben Patterson
d0f6aee339 Update script for 9 shards. 2016-01-19 17:20:21 -05:00
Ben Patterson
ce716bbbc4 Create additional bok-choy shards for faster feedback. 2016-01-19 17:18:33 -05:00
Douglas Hall
c1efd13f86 Updating xblock-lti-consumer requirement to pull in bug fix for TNL-4046 2016-01-19 16:37:47 -05:00
Ned Batchelder
2c9783c881 Merge pull request #10937 from ubc/ubcpi-0.5
Update Peer Instruction XBlock to 0.5
2016-01-19 15:03:42 -05:00
Matt Drayer
20f6b545fb Merge pull request #11256 from edx/mattdrayer/index-page-bokchoy
mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page
2016-01-19 14:28:46 -05:00
raeeschachar
d440e209e1 Fixed test course rerun failing on Chrome 2016-01-20 00:19:40 +05:00
Ben Patterson
7ca5e4ab7a Merge pull request #11255 from edx/benp/replace-actionchain-with-js
[firefox upgrade] Replace action chain with tinymce JS.
2016-01-19 11:26:53 -05:00
Douglas Hall
26e09feef7 Merge pull request #11243 from edx/hasnain-naveed/HOL-37-proxy-rss
HOL-12 HOL-29 rss_proxy djangoapp
2016-01-19 10:49:37 -05:00
Hasnain
e3c9f87364 Added rss_proxy djangoapp for proxying requests to whitelisted RSS feed URLs 2016-01-19 09:57:23 -05:00
muhammad-ammar
83be42edd0 once again new logic 2016-01-19 18:31:08 +05:00
Matt Drayer
9b35844b98 mattdrayer/index-page-bokchoy: Refactor+cover Open edX LMS index page 2016-01-18 23:12:04 -05:00
muhammad-ammar
c4065f7b33 Avoid emitting play_video event during buffering
TNL-2178
2016-01-18 19:55:37 +05:00
Douglas Hall
22e01a8c95 Merge pull request #11172 from edx/hasnain-naveed/HOL-36
HOL-36 Allow for override of course listing in index.html
2016-01-16 15:36:31 -05:00
Ben Patterson
699aa4d570 [firefox upgrade] Replace action chain with tinymce JS.
This action chain is not reliable across firefox versions (and
in fact, even on the older firefox, fails locally). Instead we
use native JS tinymce to set the content.
2016-01-16 12:46:49 -05:00
Ben Patterson
e3664c3504 Merge pull request #11220 from edx/benp/drop-db-bok-choy
TE-1133 Fix to allow for serversonly /testsonly and full test modes.
2016-01-15 16:04:10 -05:00
Ben Patterson
0c1fd7ab6b Merge pull request #11240 from edx/benp/ff42-container-block-3
Fix flaky condition for firefox 42 on subsection container block (studio)
2016-01-15 15:15:34 -05:00
Ned Batchelder
5ca8494898 Merge pull request #11249 from edx/ned/update-i18n-tools
Use the latest i18n-tools to reduce bogus problem reports
2016-01-15 14:43:29 -05:00
Ned Batchelder
37d6192e7a Merge pull request #11244 from edx/ned/update-translations
Latest translations
2016-01-15 12:40:59 -05:00
Jim Abramson
adb70e44b7 Merge pull request #11218 from edx/jsa/studio-id-token-expiration
Set default id token expiration to 5m for Studio
2016-01-15 11:37:47 -05:00
Ned Batchelder
ffbbf37052 Use the latest i18n-tools to reduce bogus problem reports 2016-01-15 11:16:41 -05:00
Matt Drayer
c9933a5878 Merge pull request #11209 from edx/saleem-latif/MAYN-167
MAYN-167: Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes
2016-01-15 11:07:50 -05:00
Ned Batchelder
5135a4c449 Update translations (autogenerated message) 2016-01-15 16:04:24 +00:00
Ned Batchelder
5ce986f526 Update translations (autogenerated message) 2016-01-15 15:28:30 +00:00
Christina Roberts
f1802d98df Merge pull request #11233 from edx/christina/undeprecate-teams
Un-deprecate teams setting.
2016-01-15 10:14:15 -05:00
Matt Drayer
9bcb1166a1 Merge pull request #11073 from edx/ziafazal/WL-245
Ziafazal/wl-245: multiple backend support for microsite
2016-01-15 10:10:27 -05:00
cahrens
a47be54050 Un-deprecate teams setting.
TNL-3803
2016-01-15 09:18:46 -05:00
Saleem Latif
a856fec574 refactor code, remove duplicate code 2016-01-15 19:17:40 +05:00
Peter Fogg
fdf540d259 Merge pull request #11236 from edx/peter-fogg/fix-course-mode-migration
Change broken course_modes migration to not touch the database.
2016-01-15 09:14:16 -05:00
Felipe Montoya
4742e661f4 Creating a settings object that is aware of the microsite settings.
Adding the declaration of the settings object to openedx.conf to be able to import it from a nicer location

Resolving quality violations

Merging dicts with the settings definition when they exist in the microsite configuration

Using a cache to improve the perfomance of quering any dictionary in the microsite definition

Ignoring the invalid-name pylint warning since the names must be kept thsi way to stay the same as the ones in django.
Removing the default dict argument as per https://docs.python.org/2/tutorial/controlflow.html#default-argument-values

Extracting the implementation of the microsite to a selectable backend.

Leaving the function startup.enable_microsites for backwards compatibilityy

Adding a database backend

Using a cache to improve the perfomance of quering any dictionary in the microsite definition.
Changed the database backend so that it extends the settings file backend and removed all the unnecessary methods.

Using the backend provider for the get_dict function

some tweeks and some initial unit tests

Using getattr as a function insteal of calling the underlying __getattr__ directly

Adding an ModelAdmin object for the microsite model in the django-admin panel

refactor enable_microsites()

consolidate/refactor some shared code

add config to aws.py and add migration files

fix tests

Changes to get the backends to run after the refactor

add archiving capabilities to microsites. Also make a few notes about performance improvements to make

fix tests

Making the query to find if microsites exist in the database faster

add ORG to microsite mapping tables and some performance improvements

allow for Mako templates to be pulled from the database

fix tests

For the database template backend the uri of the template does not use the filesystem relative path

Fixing pylint violations

Added caching of the templates stored in the database

Fixing pylint errors

fix pylint

Clearing the cache on model save

Fixing pylint errors

rebased and added test coverage

rebased cdodge/microsite-improvements branch with master and added test
coverage

added missing migration

fix quality violations

add more test coverage

mattdrayer: Add microsite_configuration to cms.INSTALLED_APPS

added microsite settings to cms/envs/test.py

run session cookie tests only in LMS

fixed broken tests

putting middleware changes back

Preventing the template_backend to be called on requests which have no microsite

changes to address feedback from mjfrey

changed BaseMicrositeBackend to AbstractBaseMicrositeBackend

changes after feedback from mattdrayer

fixed broken tests and quality violations

Allowing the backend to handle the enable_pre_startup routine

Typos and docstrings

Adressing feedback

Fixing python tests

add comment to explain why we need enable_microsites_pre_startup()
2016-01-15 14:52:36 +05:00
Hasnain
7f6d2d04ab Separate the course listing from index.html template. 2016-01-15 09:52:25 +00:00
Syed Hasan raza
68ba8ece89 Merge pull request #11199 from edx/shr/bug/TNL-2699-circuit-schematic-builder-problem-status
Indicator-container div apply to status
2016-01-15 12:31:15 +05:00
Ben Patterson
ebcafcc103 Better location. 2016-01-14 19:57:15 -05:00
Ben Patterson
29e4ba95e1 Special condition needed for newer firefox version.
On the older firefox version (28), the offset approach fails. This
update is being made as part of an effort to upgrade to firefox 42
incrementally. So we are including logic for Firefox 28 vs 42 that
we can remove after the upgrade.
2016-01-14 19:53:16 -05:00
Peter Fogg
dfbcd84ed8 Merge pull request #11234 from edx/peter-fogg/new-audit-certs
Ensure old audit certs don't get marked ineligible.
2016-01-14 15:45:32 -05:00
Peter Fogg
4f3234433b Change broken course_modes migration to not touch the database.
Changing a field name in the way that we did (updating the Python
variable name and switching it to point to the old DB column) confuses
Django's migration autodetector. No DB changes are actually necessary,
but it thinks that a field has been removed and a new one added. This
means that Django will ask users to generate the migration it thinks
is necessary, which ended up with us dropping data. The fix is to run
the same migration on Django's internal model of the DB state, but not
actually touch the DB.
2016-01-14 15:41:15 -05:00
Eric Fischer
e74fe37e16 Merge pull request #11232 from edx/efischer/ora-release
ORA staff grading release
2016-01-14 15:10:16 -05:00