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

6991 Commits

Author SHA1 Message Date
Nimisha Asthagiri
74a3665289 Update query and mongo counts 2016-06-23 20:22:32 -04:00
Toby Lawrence
bb29ad5f30 Revert "Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths."" 
This reverts commit 9967b6fd58.
 2016-06-23 13:27:15 -04:00
Andy Armstrong
caedc92d67 Merge pull request #12796 from eduNEXT/fmo/coffee_to_js_module_edit 
Converting cms module_edit.coffee to js
 2016-06-22 18:20:41 -04:00
Felipe Montoya
82db66d945 Converting the module_edit coffee file to a js file 
Converting to js and fixing references

Linting the generated code
 2016-06-22 15:49:48 -05:00
Kevin Falcone
2c41d79c6d Merge pull request #12827 from edx/release 
Release -> Master after revert
 2016-06-22 15:37:27 -04:00
Kevin Falcone
9967b6fd58 Revert "[PERF-325] Add versioned course asset URLs when canonicalizing asset paths." 
We're seeing errors in NR from objects read out of the cache lacking the
'StaticContent' object has no attribute 'content_digest'
File "/edx/app/edxapp/edx-platform/common/djangoapps/contentserver/middleware.py",
    line 70, in process_request

This reverts commit 849ebc5f22.
 2016-06-22 12:11:35 -04:00
Sofiya Semenova
08aeb27d94 Merge pull request #12803 from edx/ssemenova/disabledstates 
Got rid of aria-disabled states
 2016-06-22 09:47:25 -04:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
ssemenova
ea81090293 fixed aria-disabled states 
TNL-4805
 2016-06-21 14:07:20 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Andy Armstrong
df399de186 Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs 
Converting views/tabs.coffee in the cms to js
 2016-06-17 12:56:49 -07:00
Gregory Martin
f701058296 Merge pull request #12764 from edx/yro-add_val_duplicate_video 
Add VAL "Duplicate" status
 2016-06-17 14:49:14 -04:00
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Greg Martin
d20af4a2ba Add VAL "Duplicate" status 
Added duplicate video failed status for VAL.
 2016-06-15 11:47:38 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Toby Lawrence
9abce102ff Merge pull request #12573 from edx/PERF-325 
[PERF-325] Add versioned course asset URLs when canonicalizing asset paths.
 2016-06-15 09:05:13 -04:00
Toby Lawrence
849ebc5f22 [PERF-325] Add versioned course asset URLs when canonicalizing asset paths. 2016-06-15 08:04:52 -04:00
Chris Rodriguez
fbcf334a67 AC-472 removing outline from main 2016-06-14 14:29:00 -04:00
cahrens
ffb1ec97bd Don't hide spans within ui-btn-non class. 
TNL-4799
 2016-06-14 13:01:01 -04:00
Awais Jibran
1e67ec66cd Merge pull request #12702 from edx/aj/PLAT-1032-fix-export 
Fix course export on edge
 2016-06-13 18:46:56 +05:00
Awais Jibran
ba6ef624c2 PLAT-1032 2016-06-10 11:38:20 +05:00
Ned Batchelder
b4248d28e1 Merge pull request #12707 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-09 14:25:09 -04:00
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message) 
Update translations (autogenerated message)
 2016-06-09 12:00:04 -04:00
Calen Pennington
fc1e0b6637 Use the Django TestClient for course_creator unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
437b249d68 Use django_crum to access the current request in request_cache 2016-06-08 16:35:25 -04:00
Calen Pennington
93970f3473 Allow edxmako to be passed an explicit request to create the RequestContext from 2016-06-08 16:35:25 -04:00
Calen Pennington
25c4398125 Convert edxmako to use django_crum to get the current request 2016-06-08 16:35:24 -04:00
Christina Roberts
1f26cd2ec6 Merge pull request #12681 from edx/christina/delete-landing 
Delete old cruft from 2012/2013.
 2016-06-08 10:18:53 -04:00
Sofiya Semenova
1cda718f8f Merge pull request #12611 from edx/ssemenova/icon2 
Changing icon tags from i to span 

TNL-4692
 2016-06-07 13:36:57 -04:00
cahrens
1fa4319140 Delete old cruft from 2012/2013. 2016-06-07 13:34:31 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52:00 -04:00
Calen Pennington
12d239801e Merge pull request #12628 from cpennington/test-i18n-reset-translations 
Test i18n reset translations
 2016-06-07 10:44:07 -04:00
Ned Batchelder
d0dcfe12e4 Merge pull request #12621 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-02 19:52:51 -04:00
Andy Armstrong
7e2a174eec Move discussion board to the Pattern Library 
TNL-4622
 2016-06-02 12:48:12 -04:00
Calen Pennington
105308e129 Use translation.deactivate, rather than explicitly activating the current settings LANGUAGE_CODE 2016-06-02 11:06:59 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Douglas Hall
a07a762f73 Merge pull request #12555 from edx/hasnain-naveed/MAYN-193 
MAYN-193 Use django_sites_extensions.middleware.RedirectMiddleware to enable redirects
 2016-06-01 21:18:01 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Hasnain
11454640da Added middleware to redirect the user from expired course page to all courses page. 2016-06-01 14:56:27 -04:00
Mushtaq Ali
89a16a41e4 Merge pull request #12042 from edx/mushtaq/safe-templates 
Make templates safer
 2016-06-01 12:37:37 +05:00
Mushtaq Ali
005bee8fbe Make templates safer 2016-05-31 21:58:05 +05:00
Christina Roberts
98fcc4ff9e Merge pull request #12578 from edx/christina/tnl-4561 
Christina/tnl 4561
 2016-05-31 11:06:48 -04:00
Fred Smith
d7af2f119d SES should use the non-smtp endpoint 2016-05-31 09:46:20 -04:00
Ehtesham Kafeel
9cb660a7d2 Merge pull request #12410 from edx/fedx/upgrade-paging-collection 
Upgrade edx-platform's paging collection with new edx-ui-toolkit's paging collection
 2016-05-30 17:44:57 +05:00
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00