Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,927 Commits 1 Branch 0 Tags
7d773df52d24e0c8c1915fd4cf03cc844a932efb
Commit Graph

34927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
7d773df52d Merge pull request #11171 from edx/andya/fix-discussion-more-icons 
Fix bug with discussion response "More..." actions
 2016-01-26 15:08:41 -05:00
Adam
fa74b9f139 Merge pull request #11339 from edx/merge-release-into-master 
Merge release into master
 2016-01-26 15:00:38 -05:00
jsa
46638d7f75 fix reference to reverted test method. 2016-01-26 13:18:00 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily 
It is unneeded here, and causes bad behavior.
 2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates 
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
 2016-01-26 13:08:42 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
55b7fa4924 Merge pull request #11309 from edx/rc/2016-01-26 
Release Candidate rc/2016-01-26
 2016-01-26 11:12:19 -05:00
Cliff Dyer
40ff300efd Merge pull request #11237 from edx/cdyer/custom-oauth-expires 
Create hooks to customize OAuth2 token lifetimes.
 2016-01-26 10:05:13 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287 
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
 2016-01-25 22:27:25 -05:00
David Ormsbee
e851db58fe Merge pull request #11325 from edx/ormsbee/remove_old_sass 
Remove unused scss files.
 2016-01-25 17:13:45 -05:00
Cliff Dyer
f0908249ca Merge pull request #11301 from edx/cdyer/exif-rotation 
Preserve EXIF orientation data for profile images. (MA-1559)
 2016-01-25 15:27:17 -05:00
Jesse Zoldak
d6b258fdeb Merge pull request #11265 from edx/zoldak/bok-choy-clean 
Do not clean test files with bok choy testsonly command
 2016-01-25 15:25:03 -05:00
Adam Palay
46066c04af resolve quality violation 2016-01-25 15:04:19 -05:00
Adam
d7c154d923 Merge pull request #11328 from edx/revert-migration-rc 
Revert migration rc
 2016-01-25 14:23:29 -05:00
J. Cliff Dyer
2b6ae74885 fixup: dedupe test code. 2016-01-25 19:22:58 +00:00
Jim Abramson
a48b8b27bf Merge pull request #11318 from edx/jsa/ecom-3523 
Add COURSE_CERT_AWARDED signal and celery task stub
 2016-01-25 14:10:49 -05:00
Diana Huang
640b5d31f4 Merge pull request #10699 from doganov/TNL-3644 
Fixes TNL-3664 by collapsing actions dropdown after an action item is clicked.
 2016-01-25 13:43:24 -05:00
Adam Palay
cfab793cd3 Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" 
This reverts commit 8bc8b6cafd, reversing
changes made to c2255ef0d6.
 2016-01-25 13:36:26 -05:00
Ben Patterson
fb9f818445 Merge pull request #11327 from edx/benp/fix-builds-jan2016 
edx-user-state-client is still needed.
 2016-01-25 13:14:34 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Adam Palay
6b937a8db3 Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" 
This reverts commit 0d1765e190, reversing
changes made to d2eaa63353.
 2016-01-25 12:45:50 -05:00
Adam Palay
c9c8116da7 Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms" 
This reverts commit a84b81113b, reversing
changes made to 0d1765e190.
 2016-01-25 12:45:07 -05:00
Ben Patterson
9a23bb6050 edx-user-state-client is still needed. 2016-01-25 12:08:15 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
J. Cliff Dyer
2c2f5e3b46 Improve local settings variable name. 2016-01-25 16:25:56 +00:00
David Ormsbee
2904da0e2e Remove unused scss files. 
We have some Sass files that basically generate duplicates of other
Sass files and are no longer referenced from any pages. This looks
like it might have been stuff that never got cleaned up when
comprehensive themeing was done.

List of removed files and what they were replaced by:

    application.scss ->  lms-main.scss
    application-rtl.scss -> lms-main-rtl.scss
    course.scss -> lms-course.scss
    course-rtl.scss -> lms-course-rtl.scss

This should help speed up the Sass compile.
 2016-01-25 11:20:54 -05:00
Ahsan Ulhaq
a84b81113b Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms 
Ahsan/rc add service user in cms
 2016-01-25 21:00:23 +05:00
jsa
56d3fa011d use COURSE_CERT_AWARDED signal for milestones + badges 2016-01-25 10:54:37 -05:00
jsa
9d141ae7a1 Add config switch + signal for generating program certs. 
ECOM-3523
 2016-01-25 10:54:28 -05:00
J. Cliff Dyer
d5a96ee0ff Preserve EXIF orientation data for profile images. 
When creating profile images from an uploaded file, ensure that EXIF
orientation information is preserved, so profile images appear
right-side-up.

https://openedx.atlassian.net/browse/MA-1559
 2016-01-25 15:23:23 +00:00
Ahsan Ulhaq
31ec8ef708 Add service username in cms settings 2016-01-25 20:04:10 +05:00
M. Rehan
8c26178df3 Merge pull request #11095 from edx/mushtaq/improve_get_item 
Get only those block items which have their path to root
 2016-01-23 02:50:25 +05:00
Muhammad Rehan
352e2190eb improve get_items and has_path_to_root with temporary caches. 2016-01-23 01:50:05 +05:00
Adam
0d1765e190 Merge pull request #11311 from edx/jsa/fail-safe-reverse 
ensure reverse migration to delete a specific row won’t fail.
 2016-01-22 15:48:35 -05:00
J. Cliff Dyer
a975f59850 fixup: rework settings structure. 2016-01-22 20:42:15 +00:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Matt Drayer
479ce51bac Merge pull request #11290 from edx/saleem-latif/WL-277 
WL-277: Remove microsite_configuration/microsite.py references from individual html templates
 2016-01-22 15:31:48 -05:00
jsa
f65c5b9ce3 ensure reverse migration to delete a specific row won’t fail. 2016-01-22 14:55:51 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates 
* mattdrayer: Updated get_themed_template_path
 2016-01-22 14:27:58 -05:00
Mushtaq Ali
70b55cf1d4 Append Item only if it has path to root. 
Code refactor
 2016-01-23 00:21:32 +05:00
Douglas Hall
45db325aa4 Merge pull request #11306 from edx/douglashall/PHX-224/new_proctoring_release 
PHX-224 Upgrading edx-proctoring package to 0.12.6
 2016-01-22 14:09:39 -05:00
Douglas Hall
8e22e855cb Merge pull request #11274 from edx/ibrahimahmed443/enable-copyright-url 
uncomment copyright url to enable it in microsites
 2016-01-22 13:37:12 -05:00
Clinton Blackburn
3429453d4b Merge pull request #11251 from edx/clintonb/zendesk-update 
Install Zendesk package from PyPI
 2016-01-22 13:21:33 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Jesse Zoldak
fc45b2c82e Merge pull request #11292 from edx/zoldak/phantom-bok-choy 
Harden page objects
 2016-01-22 11:49:46 -05:00
Clinton Blackburn
b29cb5e7fe Install Zendesk package from PyPI 2016-01-22 11:49:21 -05:00
Adam
d2eaa63353 Merge pull request #11308 from edx/revert-11295-bump-problem-builder 
Revert "Bump Problem Builder Hash"
 2016-01-22 11:45:13 -05:00
Douglas Hall
abf82c1fce Upgrading edx-proctoring package to 0.12.6 to help resolve PHX-224 2016-01-22 11:25:15 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00