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

10987 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Jim Abramson
36060f3f9b Merge pull request #8053 from edx/jsa/xcom-1606 
Update ecommerce-api-client and add regression test for XCOM-1606
 2015-05-14 17:36:02 -04:00
jsa
31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 2015-05-14 16:54:56 -04:00
Ned Batchelder
b98d85fda0 Merge pull request #7943 from edx/ned/move-xmodule-modifiers 
Move xmodule_modifiers.py to openedx/xblock
 2015-05-14 16:51:46 -04:00
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Brian Talbot
c043e8dcf7 LMS: removing now unnecessary IE-specific _ie.scss Sass partial 
* since IE9 and below are formally not supported any longer
* since most of the CSS rules are for UI that has been removed or that is supported by modern browsers
 2015-05-14 14:04:53 -04:00
Brian Talbot
2899885711 LMS: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
Christina Roberts
161d89a723 Merge pull request #8045 from edx/clrux/new-extend-for-outline 
Moving no-outline use to be more global
 2015-05-14 12:54:43 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes 
Tags Tab in Student Notes
 2015-05-14 12:30:38 -04:00
Brian Talbot
4f9c50e226 Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base 
LMS: removing redundant Sass base/base partial call in build compile
 2015-05-14 12:30:12 -04:00
David Baumgold
930b4f6a7a Remove outdated comment referencing IE9 rule limit 2015-05-14 11:56:14 -04:00
Chris Rodriguez
d5d7fbf786 Moving no-outline use to be more global 2015-05-14 11:48:37 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes. 
TNL-1926
 2015-05-14 11:36:48 -04:00
Brian Talbot
8ad01535b5 LMS: removing redundant Sass base/base partial call in build compile 2015-05-14 10:47:05 -04:00
Jolyon Bloomfield
1021151efd Complete printing cleanup, rebased into one 2015-05-13 18:31:38 -04:00
AlasdairSwan
8d0ac31e38 ECOM-986 updated class being used by JS for carats to use classes being loaded on the page via lms-style-course-vendor.css 2015-05-13 13:38:29 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor 
Implement the Weighted Problem Grade Report
 2015-05-13 09:10:02 -04:00
Adam
9115960eac Merge pull request #8013 from edx/merge-release-into-master 
Merge release into master
 2015-05-13 08:39:23 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Brian Talbot
806e2b3901 Merge pull request #7985 from edx/talbs/sass-build-files 
LMS/Studio: Sass Build Files to Reduce Compilation Redundancy
 2015-05-13 05:33:43 -04:00
Awais
f31746e76c ECOM-1471 Hiding the text. 2015-05-13 13:44:55 +05:00
Awais Qureshi
b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure 
ECOM-1531 adding the fake-page for softwar secure.
 2015-05-13 12:02:32 +05:00
Brian Talbot
220b8d1cdb LMS: removing conditional search Sass logic + simplifying _build-*.scss files 2015-05-12 22:13:31 -04:00
Brian Talbot
24673aa128 LMS: moving shared/redundant Sass partial calls to _build-*.scss partials 2015-05-12 22:03:43 -04:00