- 22 Nov, 2015 1 commit
-
-
Ned Batchelder committed
-
- 10 Nov, 2015 1 commit
-
-
Please note that this is a squshed commit and the work of: Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
Usman Khalid committed
-
- 30 Oct, 2015 1 commit
-
-
Muhammad Shoaib committed
-
- 28 Oct, 2015 1 commit
-
-
* The LMS now also monkey-patches xmodule.x_module.descriptor_global_handler_url and xmodule.x_module.descriptor_global_local_resource_url so that we can get LMS XBlock URLs from the DescriptorSystem. That functionality is needed in the block transforms collect() phase for certain XModules like Video. For instance, say we want to generate the transcripts URLs. The collect phase is run asynchronously, without a user context. * The URL handler monkey-patching is now done in the startup.py files for LMS and Studio. Studio used to do this in the import of cms/djangoapps/contentstore/views/item.py. This was mostly just because it seemed like a sane and consistent place to put it. * LmsHandlerUrls was removed, its handler_url and local_resource_url methods were moved to be top level functions. The only reason that class existed seems to be to give a place to store course_id state, and that can now be derived from the block location. * To avoid the Module -> Descriptor ProxyAttribute magic that we do (which explodes with an UndefinedContext error because there is no user involved), when examining the block's handler method in handler_url, I made a few changes: ** Check the .__class__ to see if the handler was defined, instead of the block itself. ** The above required me to relax the check for _is_xblock_handler on the function, since that will no longer be defined. 90% of this goes away when we kill XModules and do the refactoring we've wanted to do for a while.
David Ormsbee committed
-
- 01 Oct, 2015 1 commit
-
-
Bill DeRusha committed
-
- 28 Sep, 2015 2 commits
-
-
Ben Patterson committed
-
* Upgrade edx-submissions * Upgrade edx-ora2 * Upgrade edx-val * Upgrade edx-proctoring * Update all edx-platform code that depends on DRF, including: - auth_exchange - cors_csrf - embargo - enrollment - util - commerce - course_structure - discussion_api - mobile_api - notifier_api - teams - credit - profile_images - user_api - lib/api (OAuth2 and pagination)
Will Daly committed
-
- 25 Sep, 2015 1 commit
-
-
* Upgrade edx-submissions * Upgrade edx-ora2 * Upgrade edx-val * Upgrade edx-proctoring * Update all edx-platform code that depends on DRF, including: - auth_exchange - cors_csrf - embargo - enrollment - util - commerce - course_structure - discussion_api - mobile_api - notifier_api - teams - credit - profile_images - user_api - lib/api (OAuth2 and pagination)
Will Daly committed
-
- 24 Sep, 2015 2 commits
-
-
Bill DeRusha committed
-
Wrap 3rd Party Auth Pipeline with Segment enabled checks
Bill DeRusha committed
-
- 17 Sep, 2015 1 commit
-
-
This is a squash of 38 commits ending with 5b080f979d692804452400ac5bed9b17c50b001e
David Baumgold committed
-
- 13 Aug, 2015 1 commit
-
-
Chris Dodge committed
-
- 13 Jul, 2015 1 commit
-
-
Sarina Canelake committed
-
- 26 Jun, 2015 1 commit
-
-
Braden MacDonald committed
-
- 08 Apr, 2015 1 commit
-
-
Adam Palay committed
-
- 23 Mar, 2015 1 commit
-
-
This makes these files importable, and puts them into the new best guess as to where files should live.
Ned Batchelder committed
-
- 11 Dec, 2014 1 commit
-
-
This commit pulls in changes from #4487 that implements keyword substitution for bulk emails. With these changes, an instructor can include keywords in their bulk emails which will be automatically substituted with the corresponding value for the recepient of the email. Keywords are of the form %%keyword%%, and the keywords implemented in this commit include: %%USER_ID%% => anonymous_user_id %%USER_FULLNAME%% => user profile name %%COURSE_DISPLAY_NAME%% => display name of the course %%COURSE_END_DATE%% => end date of the course Client-side validations have also been implemented to ensure that only emails with well-formed keywords can be sent. The architecture is designed such that adding in new keywords in the future would be relatively straight-forward.
njdup committed
-
- 01 Dec, 2014 1 commit
-
-
Sarina Canelake committed
-
- 04 Nov, 2014 1 commit
-
-
Sarina Canelake committed
-
- 14 Oct, 2014 1 commit
-
-
Usman Khalid committed
-
- 11 Sep, 2014 1 commit
-
-
Usman Khalid committed
-
- 29 Aug, 2014 1 commit
-
-
Also, removed the client-side analytics for logging in. Ensures that analytics are collected for third-party-auth logins. Fixed failing tests related to third-party-auth.
Julia Hansbrough committed
-
- 27 Aug, 2014 1 commit
-
-
Modify Django's translation library, such that the gettext family of functions return an empty string when attempting to translate a falsey value. This overrides the default behavior [0]: > It is convention with GNU gettext to include meta-data as the > translation for the empty string. This patch provides a holistic solution to replace the current piecemeal approach [1][2]. Affected Methods: - gettext - ugettext [0] https://docs.python.org/2.7/library/gettext.html#the-gnutranslations-class [1] bad803e4 [2] https://github.com/edx/edx-platform/pull/4653
stv committed
-
- 30 Jul, 2014 1 commit
-
-
This reverts commit 079808ee.
Renzo Lucioni committed
-
- 29 Jul, 2014 1 commit
-
-
This reverts commit 252038c3, reversing changes made to 7caf8c53.
Julia Hansbrough committed
-
- 28 Jul, 2014 1 commit
-
-
Renzo Lucioni committed
-
- 24 Jul, 2014 1 commit
-
-
Kevin Luo committed
-
- 29 May, 2014 2 commits
-
-
Alan Boudreault committed
-
Alan Boudreault committed
-
- 01 Apr, 2014 1 commit
-
-
Pluggable InputTypes use edxmako.paths.add_lookup to inject new mako template directories. Those were getting clobbered by microsites (and by theming), which were completely rebuilding the mako template lookup list from scratch. This commit switches those two features to use the same add_lookup function as pluggable InputTypes. [LMS-2489]
Calen Pennington committed
-
- 07 Mar, 2014 1 commit
-
-
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.
John Cox committed
-
- 28 Feb, 2014 1 commit
-
-
Chris Dodge committed
-
- 04 Feb, 2014 1 commit
-
-
Allow templates override.
Bertrand Marron committed
-
- 24 Jan, 2014 1 commit
-
-
Don't force modulestore initialization when running lms manage.py, only when running via the wsgi file
Calen Pennington committed
-
- 13 Jan, 2014 2 commits
-
-
change ruby and to &&
Jason Bau committed
-
- 11 Jan, 2014 1 commit
-
-
Jason Bau committed
-
- 08 Jan, 2014 1 commit
-
-
David Baumgold committed
-
- 02 Jan, 2014 1 commit
-
-
I was going to do something in the startup code, then changed my mind, but didn't want to just discard these changes.
Ned Batchelder committed
-
- 01 Oct, 2013 1 commit
-
-
There's no need to display a traceback for every failed content load, the comment before the log line even says so. The exceptions shown before tests are run are because of the eager initialization of the modulestores. They don't need to be initialized then, that just speeds the responsiveness of servers. Putting off the initialization means they get inited as needed, and the log lines get
Ned Batchelder committed
-