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

35669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matjaz Gregoric
9b89bd3245 Make comprehensive theme work with django templates. 
Comprehensive theming did not work with django templates (used by course wiki).

The reason it didn't work was that in order for the theme to work, theme template folder
has to be added to django template dirs setting *before* django startup.
After django startup, modifying `settings.DEFAULT_TEMPLATE_ENGINE['DIRS']` has no effect,
because at that point the template engine is already initialized with a copy of the
template dirs list.

Instead of running the theme startup code as an autostartup hook, we manually run it
*before* `django.setup()`. This is fine because theme startup code doesn't have to do
anything else besides modifying some settings and doesn't actually need django to be
initialized.
 2016-01-25 08:45:52 +01: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
Ben Patterson
15ff497f75 Merge pull request #11298 from edx/benp/bok-choy-0410 
Upgrade to bok-choy 0.4.10
 2016-01-22 11:15:01 -05:00
Ned Batchelder
106a822def Merge pull request #11305 from edx/ned/fix-flaky-test 
Add @flaky
 2016-01-22 11:11:59 -05:00
raeeschachar
8b24d6380a Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate 
Fixed test can create and edit signatories of certificate failing on …
 2016-01-22 21:10:17 +05:00
Ned Batchelder
6d1abbad9c Merge pull request #11299 from edx/ned/updated-translations 
Update translations (autogenerated message)
 2016-01-22 10:56:04 -05:00
Adam
f3159e40e5 Revert "Bump Problem Builder Hash" 2016-01-22 10:47:39 -05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ahsan Ulhaq
8bc8b6cafd Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api 
Update edx-organization version and organization URL
 2016-01-22 20:26:00 +05:00
Ibrahim
bf272733ac uncomment copyright url to enable it in microsites 2016-01-22 10:02:07 -05:00
Ned Batchelder
30209b1486 Add @flaky 2016-01-22 09:48:25 -05:00
Ahsan Ulhaq
4f94b50cf2 Update edx-organization version and organization URl 
ECOM-3486
 2016-01-22 19:35:59 +05:00
Awais Jibran
c2255ef0d6 Merge pull request #11226 from edx/aj/ecom3384-course-image-breaking 
Studio - Schedule & Details tab broken
 2016-01-22 18:56:15 +05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms 
ECOM-3384
 2016-01-22 16:49:57 +05:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS 
ECOM-3419
 2016-01-22 13:00:36 +05:00
Eric Fischer
039e6cdfe6 Merge pull request #11300 from edx/efischer/ora2_release 
ORA2 Weekly Release
 2016-01-21 16:48:13 -05:00
Eric Fischer
71cb070a72 edx-ora2 weekly release version update 2016-01-21 15:53:36 -05:00
Ned Batchelder
bf951b4e40 Update translations (autogenerated message) 
Update translations (autogenerated message)

Update translations (autogenerated message)
 2016-01-21 15:51:55 -05:00