Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
41e84a58dd Skip flaky test. SOL-618. 2015-05-18 14:11:20 -04:00
David Baumgold
8a4503b3f4 Display Scope.content fields in Studio editor 
But mark `data` as non-editable metadata, so that it doesn't appear
 2015-05-18 14:09:38 -04:00
Greg Price
7309352ef7 Refactor discussion API to use DRF serializer 
This will make it easier to add the creation and update interfaces.
 2015-05-18 14:03:02 -04:00
Greg Price
565cdb8edf Move Discussion API access control checks 
The checks are now within the Python API instead of the DRF view. This
will be necessary for certain operations (like fetching/editing threads)
because the relevant course cannot be known until the thread is fetched
from the comments service. This commit updates the existing endpoints to
fit that pattern.
 2015-05-18 14:03:02 -04:00
Marco Morales
e121aa4783 updated dashboard html to remove rebase bug which displayed the username to learners 2015-05-18 13:55:56 -04:00
AlasdairSwan
f81d88e394 ECOM-1547 created new template and Sass file for new footer. Wrapped it in a feature flag and updated previously named footer-edx-new.html to footer-edx-v2.html to better track/name updates to the footer going forward. 
ECOM-1547 removed data-updated attributes from body
ECOM-1548 added JS file that inits analytics event listener and makes ajax call to API to get footer and HTML and add it to the DOM
ECOM-1547 code review cleanup
ECOM-1547 rebase and Sass appraoch update after @talbs the IE9 killer slayed the mighty beast.
ECOM-1547 updated file names and added comments in light of @talbs review of PR
ECOM-1547 update to social media link styles and nav link order
ECOM-1547 updated SOCIAL_MEDIA_FOOTER_NAMES if ENABLE_FOOTER_V3 is true
ECOM-1547 added translations to screenreader text
ECOM-1547 fixed test and renamed files in line with @talbs's pending PR
ECOM-1547 cleaned up file naming
 2015-05-18 13:43:07 -04:00
Gabe Mulley
63b0378520 Ensure GA events have a course label if available 2015-05-18 13:25:12 -04:00
chrisndodge
fe3326d8f2 Merge pull request #8083 from edx/muhhshoaib/MAYN-68-total-in-instrucor-dashboard-doesnt-include-multi-seats-purchases 
MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases.
 2015-05-18 12:05:03 -04:00
David Baumgold
ffd5c1fcd8 Merge pull request #8071 from edx/db/remove-sample-feature-flag 
The SAMPLE feature flag is not used anywhere
 2015-05-18 11:20:58 -04:00
Brian Talbot
11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names 
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
 2015-05-18 10:43:17 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase 
Dcikatic/sol 487 filter staff view (rebase against master)
 2015-05-18 10:40:57 -04:00
Sarina Canelake
3f739b05b1 Merge pull request #7997 from openfun/rmoch/i18n_problem_explanation_title 
i18n lon-capa problem explanation title
 2015-05-18 10:11:01 -04:00
Richard Moch
8ce222ed74 Add Richard Moch to AUTHORS 2015-05-18 13:17:04 +00:00
Richard Moch
3e0342cbb3 i18n lon-capa problem explanation title 2015-05-18 13:16:59 +00:00
Muhammad Shoaib
392937d9e1 MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. 2015-05-18 15:51:19 +05:00
Awais Qureshi
41363ead93 Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue 
ECOM-1471 Hiding the text.
 2015-05-18 11:40:10 +05:00
swdanielli
4f531f6fbc Merge pull request #7750 from edx/danielli/recommender_xml 
fix recommender olx parsing
 2015-05-15 19:30:08 -04:00
Renzo Lucioni
2ba5d483fc Merge pull request #8078 from edx/release 
Merging hotfix into the RC
 2015-05-15 17:40:05 -04:00
Renzo Lucioni
85e8fa5dbc Merge pull request #8074 from edx/hotfix/2015-05-15 
Refine error page regexes such that they only match 404 and 500
 2015-05-15 16:28:34 -04:00
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup 
Complete Printing Cleanup
 2015-05-15 15:42:36 -04:00
David Baumgold
8a7c2d66d8 Merge pull request #8068 from edx/db/remove-mathplayer-message 
Remove MathPlayer message
 2015-05-15 15:30:24 -04:00
Christine Lytwynec
8f22b51117 Merge pull request #8056 from edx/clytwynec/TE-868 
use mock_open for paver quality tests
 2015-05-15 15:12:01 -04:00
David Baumgold
90daffe33d Merge pull request #8057 from edx/db/reorg-main-html-imports 
Reorganize imports in main HTML templates for Studio and LMS
 2015-05-15 15:00:34 -04:00
Diana Huang
b147117d22 Merge pull request #8055 from edx/diana/team-advanced-setting 
New teams advanced setting
 2015-05-15 14:55:34 -04:00
Shrhawk
dd20badcf7 Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course 
bulk_email fix course_image_unicode name
 2015-05-15 23:31:01 +05:00
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
swdanielli
09b7fee38e update xml 
the xml parsing was out-of-date and we fix it
 2015-05-15 14:11:02 -04:00
Renzo Lucioni
c940b61531 Refine error page regexes such that they only match 404 and 500 2015-05-15 14:05:11 -04:00
Ahsan Ulhaq
e7a348d6d9 Merge pull request #8062 from edx/ahsan/AC-108-no-role-inside-courseware-lms 
No role inside of courseware
 2015-05-15 13:23:30 -04:00
Sarina Canelake
a01e92c2e8 Merge pull request #8072 from edx/sarina/20150515-translations-update 
Update translations (autogenerated message)
 2015-05-15 13:21:34 -04:00
Sarina Canelake
87954cd1e0 Update translations (autogenerated message) 2015-05-15 13:20:53 -04:00
David Baumgold
2e1534d75a The SAMPLE feature flag is not used anywhere 2015-05-15 12:49:04 -04:00
Brian Talbot
99a3053918 Merge pull request #8067 from edx/talbs/lms-update-browser-links 
LMS: Keeping Browser Linkage Fresh to Death
 2015-05-15 12:43:06 -04:00
David Baumgold
85839b5801 Reorganize imports in main HTML templates for Studio and LMS 2015-05-15 12:34:04 -04:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers 
Add super() calls to setUp/tearDown that are missing them
 2015-05-15 12:29:14 -04:00
David Baumgold
c3095235ff Remove MathPlayer message 2015-05-15 11:23:30 -04:00
Brian Talbot
76fa485230 LMS: updating recommended/modern browser links 2015-05-15 11:22:17 -04:00
Christine Lytwynec
4aceb0259b add more detailed comment about exit status 2015-05-15 11:09:55 -04:00
Christopher Lee
a57f0d7410 Merge pull request #7794 from edx/clee/gated_content_mobile_api 
MA-635 Block Mobile Content for unfulfilled milestones
 2015-05-15 10:24:04 -04:00
Brian Talbot
3e247cd63a Merge pull request #8061 from edx/talbs/update-ie-conditionals 
LMS/Studio: Update Use of IE Conditional Comments
 2015-05-15 10:16:58 -04:00
Muzaffar yousaf
ab912fa811 Merge pull request #7956 from edx/muzaffar/tnl2047-profile-tweaks 
Learner Profile page tweaks.
 2015-05-15 19:15:20 +05:00
Christine Lytwynec
71bc1476e8 start paver quality tests with clean paver task environment 2015-05-15 10:08:23 -04:00
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones 
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
 2015-05-15 09:39:54 -04:00
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting. 
Adding the pyuca to support sorting in differnet languages.

TNL-2047
 2015-05-15 17:07:14 +05:00
muzaffaryousaf
378cf9bb7a Sending preferences and accounts data to template. 
Fixing the pencil icon issue.

TNL-2047
 2015-05-15 17:06:04 +05:00
muzaffaryousaf
2d08d669ca Learner Profile page tweaks. 
TNL-2047
 2015-05-15 17:06:02 +05:00
Ahsan Ulhaq
7922858526 No role inside of courseware 
AC-108
 2015-05-15 11:23:34 +05:00
Brian Talbot
bac56af74c Studio: updating use of IE-conditional comments 
* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
 2015-05-14 23:38:28 -04:00
Brian Talbot
aad7c52f41 LMS: updating use of IE-conditional comments 
* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
* to remove HTML5 shiv that's not needed for IE10 and above
 2015-05-14 23:34:20 -04:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them 
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
 2015-05-14 18:14:21 -04:00