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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
105308e129 Use translation.deactivate, rather than explicitly activating the current settings LANGUAGE_CODE 2016-06-02 11:06:59 -04:00
Calen Pennington
6963c5307b Deactivate translations after all i18n tests in courseware so that they don't leak to future tests 2016-06-02 11:06:59 -04:00
Calen Pennington
234ed7635b Reset client post parameters after each payment_fake test, because the sign method modifies the supplied dictionary 2016-06-02 11:04:16 -04:00
Cliff Dyer
9acc82ddf5 Merge pull request #12595 from edx/cdyer/authorize-endpoint 
Dispatch authorization endpoint to correct backend.
 2016-06-02 11:02:04 -04:00
Renzo Lucioni
a8150a51d2 Supplement program data with course and enrollment data 
The supplemented data is passed through to the program details page. Part of ECOM-4415.
 2016-06-02 10:57:46 -04:00
Douglas Hall
1d23b806e5 Fix JQuery data attribute type conversion bug for shopping cart 2016-06-02 10:51:54 -04:00
Ned Batchelder
64828c48c8 Update translations (autogenerated message) 2016-06-02 14:36:45 +00:00
Kevin Kim
aecb809205 Merge pull request #12553 from edx/kkim/neg_vert_positions 
Changed courseware/views/index.py to fix negative vertical positions
 2016-06-02 10:32:21 -04:00
wajeeha-khalid
d03f4a97c4 Merge pull request #12568 from edx/jia/MA-2419 
MA-2419: make thread 'read' mutual exlusive to update fields
 2016-06-02 19:29:03 +05:00
Attiya Ishaque
f7659c8bb7 Merge pull request #12587 from edx/PLAT-1004-Email-field-lenght 
Set the Email field length is 254 characters.
 2016-06-02 19:28:07 +05:00
J. Cliff Dyer
1270df1500 Enable dispatch of Authorization endpoint. 
* Created URL route
* Expanded test code to confirm expected behavior

MA-2124
 2016-06-02 13:58:38 +00:00
Attiya Ishaque
62b431ead3 Merge branch 'master' into PLAT-1004-Email-field-lenght 2016-06-02 18:12:54 +05:00
wajeeha-khalid
9d3365f067 Merge pull request #12424 from edx/jia/MA-2050 
MA-2050: add profile image url in GET thread & comment
 2016-06-02 18:01:38 +05:00
Peter Fogg
6fc2c4a421 Merge pull request #12617 from edx/peter-fogg/catalog-page-titles 
Add page titles to API admin pages.
 2016-06-02 08:31:52 -04:00
attiyaishaque
47f2f7de0f Set the Email field length is 254 characters. 2016-06-02 17:08:06 +05:00
wajeeha-khalid
f19af52054 MA-2050: add optional user profile details in GET thread & comment 2016-06-02 17:05:00 +05:00
Waheed Ahmed
c681c56768 Merge pull request #12586 from edx/waheed/fix-i18n-issues 
Fixed i18n issues, follow up PR for "Account Settings Navigation".
 2016-06-02 16:15:42 +05:00
Waheed Ahmed
c8d23c1603 Fixed i18n issues, follow up PR for "Account Settings Navigation". 
ECOM-4582
 2016-06-02 15:22:32 +05:00
wajeeha-khalid
655c1aa20f Merge pull request #12445 from edx/jia/MA-2318 
MA-2318: get DiscussionTopic against topic id
 2016-06-02 13:46:47 +05:00
wajeeha-khalid
1d5fe0ed33 MA-2419: make thread 'read' mutual exlusive to update fields 2016-06-02 11:38:25 +05:00
wajeeha-khalid
3c0502726c MA-2318: get DiscussionTopic against topic id 2016-06-02 11:33:39 +05: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
Peter Fogg
f1753ed19e Add page titles to API admin pages. 
ECOM-4264
 2016-06-01 17:00:11 -04:00
Simon Chen
928e4b46a0 ECOM-4218 Draft 2 to add course card styles (#12593) 
ECOM-4218 Draft 2 to add course card styles
 2016-06-01 16:42:03 -04:00
Kevin Kim
17b8dfa94d Changed courseware/views/index.py to fix negative vertical positions 
TNL-4408
 2016-06-01 20:16:46 +00:00
Brian Jacobel
dfd684ffd0 One more instance of require_module outside block js_extra 2016-06-01 16:11:19 -04:00
Renzo Lucioni
3552457375 Merge pull request #12614 from edx/renzo/prevent-catalog-caching 
Prevent dumpdata from dumping api_admin's Catalog model
 2016-06-01 15:31:45 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Douglas Hall
16bf044eee Merge pull request #12612 from edx/douglashall/OSPR-1272/upgrade_lti_consumer 
OSPR-1272 Upgrading xblock-lti-consumer to v1.0.7
 2016-06-01 14:56:55 -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
Renzo Lucioni
835c9cc957 Prevent dumpdata from dumping api_admin's Catalog model 
The Catalog model is unmanaged, meaning no corresponding table exists in the database. When dumpdata tries to dump this model, it chokes because there's no table to read from.
 2016-06-01 14:21:00 -04:00
AlasdairSwan
81d2c75d6b Merge pull request #12576 from edx/rc/2016-05-31 
Release Candidate rc/2016-05-31
 2016-06-01 13:44:32 -04:00
Douglas Hall
0d49527607 Upgrading xblock-lti-consumer to v1.0.7 2016-06-01 13:41:57 -04:00
Brian Jacobel
47bc8e65f3 Fix actual safe template violations 2016-06-01 12:53:21 -04:00
Brian Jacobel
7c7ab81531 Add require_module_async to safe template linter js context trigger 2016-06-01 12:07:17 -04:00
Brian Jacobel
2e4ad45bb0 Make require_module_async call require_module 2016-06-01 12:07:17 -04:00
Brian Jacobel
c281586a29 Fix other usages of require_module outside <%block name="js-extra" 2016-06-01 12:07:17 -04:00
Brian Jacobel
d9c798dca3 Fix JS load order issues for edxnotes 2016-06-01 12:07:17 -04:00
Brian Jacobel
6135323427 Load factory JS files with a synchronous <script> tag in production 2016-06-01 12:07:17 -04:00
Sofiya Semenova
7fa763b29f Merge pull request #12579 from edx/christina/icons 
Christina/icons
 2016-06-01 09:26:35 -04:00
Matt Drayer
6bac7c49bf Merge pull request #12603 from edx/mattdrayer/determine-correct-checkout 
mattdrayer/determine-correct-checkout: Select proper checkout workflow based on context
 2016-06-01 09:23:14 -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
Matt Drayer
42af66cee7 mattdrayer/determine-correct-checkout: Select proper checkout workflow based on context 2016-06-01 00:39:15 -04:00
Clinton Blackburn
8ea3b62016 Added admin for UserAttribute model (#12596) 
ECOM-4502
 2016-05-31 18:22:18 -04:00
Clinton Blackburn
2fd9896ca1 Allowing profile image upload date to be blank (#12601) 2016-05-31 16:46:11 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
Andy Armstrong
42f44848e5 Merge pull request #12585 from edx/andya/course-navigation-safe-template 
Refactor staff preview menu logic out of template
 2016-05-31 14:05:24 -04:00
Tasawer Nawaz
454368bbc2 Merge pull request #12594 from edx/revert-ecom-4334-update-learner-dashboard 
Revert "ECOM-4334 Update learner dashboard"
 2016-06-01 02:03:05 +08:00
Mushtaq Ali
005bee8fbe Make templates safer 2016-05-31 21:58:05 +05:00
Peter Fogg
62aca484fd Merge pull request #12592 from edx/peter-fogg/cookies-again 
https://github.com/edx/edx-platform/pull/12588, round 2!
 2016-05-31 12:20:12 -04:00