Commit Graph

34783 Commits

Author SHA1 Message Date
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +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
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
Peter Fogg
54c349b437 Ensure old audit certs don't get marked ineligible. 2016-01-14 14:40:54 -05:00
Edward Zarecor
c37378fe29 Merge pull request #11231 from edx/release
Merging changes for the patch release back to master
2016-01-14 14:37:43 -05:00
Douglas Hall
0479870972 Merge pull request #11213 from edx/hasnain-naveed/MAYN-154
MAYN-154 / Added site_map in static template
2016-01-14 14:34:22 -05:00
Ben Patterson
2b731b70d5 Fix flaky condition only appearing in newer firefox versions. 2016-01-14 14:33:19 -05:00
AlasdairSwan
a82d582568 Merge pull request #11169 from edx/alasdair/ECOM-2967-xseries-dashboard-GA-events
ECOM-2967 adding GA events for dashboard XSeries messages
2016-01-14 14:27:25 -05:00
Hasnain
c14f65a293 Added site_map in static template
Allow file extensions in MKTG_URL_LINK_MAP template keys
Set content type on requests for static templates based on the template key
2016-01-14 13:44:54 -05:00
AlasdairSwan
2676098b02 ECOM-2967 adding GA events for dashboard XSeries messages 2016-01-14 12:37:48 -05:00
Eric Fischer
c8ceb21e6d ORA staff grading release 2016-01-14 12:18:43 -05:00
Edward Zarecor
b70198f914 Merge pull request #11225 from edx/patch/2016-01-14
Removing CDN RPC
2016-01-14 12:08:28 -05:00
Peter Fogg
d26452dea7 Merge pull request #11217 from edx/peter-fogg/fix-auditing-status-certs
Allow certificates with 'auditing' status to be regenerated.
2016-01-14 10:39:47 -05:00
Toby Lawrence
2c40454db0 Merge pull request #11223 from edx/perf/crush-all-the-imgs
Crush down images.
2016-01-14 09:42:17 -05:00
Ben Patterson
15b015abdc Only update comments; leave reset_db in place. 2016-01-14 06:23:08 -05:00
Saleem Latif
041ec4c267 Remove unused imports from /tests/test_api.py 2016-01-14 13:36:27 +05:00
Saleem Latif
4122f695d8 Bulk uploads (CSV) of manual enrollments on white labels should be performed as 'honor' modes 2016-01-14 13:35:30 +05:00
Toby Lawrence
dc727104ae Revert larger_image.png so test passes.
There's a test to ensure users can't upload too large of a profile picture, so the picture was too small to trigger that behavior, and now fails.  This just returns the image to its original size.
2016-01-13 22:02:36 -05:00
Edward Zarecor
546610084c Removing CDN RPC
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
2016-01-13 21:46:57 -05:00
Toby Lawrence
d65a4ca95d Adding optimized images in batches [19/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
368acafad4 Adding optimized images in batches [18/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
8d8f282a5a Adding optimized images in batches [17/19] 2016-01-13 20:38:43 -05:00
Toby Lawrence
1e8263f325 Adding optimized images in batches [16/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
0009d53c53 Adding optimized images in batches [15/19] 2016-01-13 20:38:42 -05:00
Toby Lawrence
3b73839ed2 Adding optimized images in batches [14/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c19a6af96b Adding optimized images in batches [13/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
c71f0fa2ce Adding optimized images in batches [12/19] 2016-01-13 20:38:41 -05:00
Toby Lawrence
0cdaa975fc Adding optimized images in batches [11/19] 2016-01-13 20:38:40 -05:00
Toby Lawrence
7efd8773fb Adding optimized images in batches [10/19] 2016-01-13 20:38:40 -05:00