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

30229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
05cd3316d3 Fix pre-existing pylint errors. Diff-quality won't let me move the file otherwise. 2015-05-14 16:03:50 -04:00
Ned Batchelder
7c704f3959 Move xmodule_modifiers.py to openedx/core/lib/xblock_utils.py 2015-05-14 16:03:50 -04:00
Sarina Canelake
25eb6942b6 Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199 
Add flaky test decorator (TNL-2199)
 2015-05-14 15:26:43 -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
Sarina Canelake
f3f0f08422 Add flaky test decorator (TNL-2199) 2015-05-14 12:10:42 -04:00
David Baumgold
57143d60de Merge pull request #8050 from edx/db/remove-ie9-rule-limit-comment 
Remove outdated comment referencing IE9 rule limit
 2015-05-14 12:08:48 -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
Sarina Canelake
269432ae34 Merge pull request #8033 from caijim/patch-2 
Update AUTHORS
 2015-05-13 17:24:06 -04:00
Jim
708eb97c74 Update AUTHORS 
adding self to authors file
 2015-05-13 14:22:23 -07:00
Diana Huang
3f5b154d18 Merge pull request #8025 from edx/diana/fix-flaky-bok-choy-test 
Catch BSON errors as well as PyMongo errors when emitting MongoDB events.
 2015-05-13 16:13:02 -04:00
Christine Lytwynec
b328a2e893 Merge pull request #8029 from edx/clytwynec/all-tests-exit-status 
add exit status back
 2015-05-13 15:09:01 -04:00
AlasdairSwan
905309a6fb Merge pull request #7995 from edx/alasdair/ECOM-986-the-wayward-caret 
ECOM-986 updated class being used by JS for carats to use classes bei…
 2015-05-13 14:53:13 -04:00
Kyle McCormick
887c4f4522 Merge pull request #8028 from edx/kyle/add-to-author-file 
add self to author file
 2015-05-13 14:36:11 -04:00
Christine Lytwynec
5b8482f345 add exit status back 2015-05-13 14:27:23 -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
Kyle McCormick
f0dcf7e213 add self to author file 2015-05-13 13:30:18 -04:00
Ned Batchelder
c2772e4aac Merge pull request #8026 from edx/ned/tweak-contributing 
Add pointers to guidelines of specific concern.
 2015-05-13 12:36:39 -04:00
Jesse Zoldak
b34a48f09a Merge pull request #8023 from edx/zoldak/update-bok-choy 
Update bok-choy version to the latest release
 2015-05-13 12:30:20 -04:00
Diana Huang
362c632ad7 Catch BSON errors as well as PyMongo errors when emitting 
MongoDB events.

TNL-2035
 2015-05-13 12:21:53 -04:00
Ned Batchelder
b5fbf853c7 Add pointers to guidelines of specific concern. 2015-05-13 11:21:16 -04:00