Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,331 Commits 1 Branch 0 Tags
2e2a23b9d3c69ede49c2efb49723cabf9928ef97
Commit Graph

38331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Morales
2e2a23b9d3 Merge pull request #13204 from edx/marco/copyrightyear/update 
Updated copyright year for LMS / CMS
 2016-08-26 10:51:43 -04:00
Waheed Ahmed
a766025920 Merge pull request #13315 from edx/waheed/ecom-5303-fix-focus-remain-within-modals 
Fixed focus should remain within the simulated dialogs.
 2016-08-26 19:05:43 +05:00
Eric Fischer
3b9ac3de8e Merge pull request #13325 from edx/efischer/ora_update 
ORA version bump
 2016-08-26 09:32:56 -04:00
Mushtaq Ali
db8e26d10a Merge pull request #13300 from edx/mushtaq/sust-57 
Fix mongo store's has_course with a split course key
 2016-08-26 17:19:29 +05:00
Waheed Ahmed
ae849406bf Fixed focus should remain within the simulated dialogs. 
ECOM-5303
 2016-08-26 16:28:51 +05:00
Chris
3ea28a9387 Merge pull request #13326 from edx/release 
Release with hotfixes 2016-08-23
 2016-08-26 06:59:27 -04:00
Mushtaq Ali
ec13ba4340 Fix when checking in mongo store, has_course with a split course key returns False. 2016-08-26 15:49:34 +05:00
Ned Batchelder
d440124c1a Merge pull request #13316 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-26 06:49:22 -04:00
Chris
15dab29bd6 Merge pull request #13308 from edx/hotfix/2016-08-24_clrux 
Hotfix: edx-opaque-keys 0.3.3, OpaqueKeyField newline usage log, fix inline JS for CCX navigation
 2016-08-25 21:04:39 -04:00
Eric Fischer
68359417f7 edx-ora2 version bump 2016-08-25 17:08:20 -04:00
Eric Fischer
2dc4f5d6bf Merge pull request #13303 from edx/efischer/tnl_5057 
TNL 5057 Silence XML parse error in capa_module
 2016-08-25 16:30:15 -04:00
Eric Fischer
bf4211088f Merge pull request #13295 from edx/efischer/opt_grade 
Grades cleanup
 2016-08-25 16:29:55 -04:00
sanfordstudent
fb20312ef1 Merge pull request #13294 from edx/sstudent/TNL-5041 
check for null doc
 2016-08-25 14:49:24 -04:00
John Eskew
43834839b1 Quality fixes and unicode strings for logs. 2016-08-25 13:43:51 -04:00
John Eskew
81ad1dc6df Bump version of edx-opaque-keys to rolled-back caching 0.3.3 2016-08-25 12:24:36 -04:00
John Eskew
db25725f32 Log when OpaqueKeyField detects trailing newline to/from DB. 
Correct the key when reading from DB into a key object.
 2016-08-25 12:24:21 -04:00
M. Rehan
43bbe952b2 Merge pull request #13286 from edx/mrehan/plat-1046-update-lib-children-on-branches 
PLAT-1046 – update library content block's children on branches
 2016-08-25 21:08:24 +05:00
Eric Fischer
0059f88d2a Silence XML parse error in capa_module 
TNL-5057 This un-actionable error is polluting the stream of devops pages, and
should be quieted. A longer term fix will be made in TNL-5245.
 2016-08-25 12:00:18 -04:00
Eric Fischer
13687e4753 Grades cleanup 
Small changes to the grades djangoapp
    -sets up mock_get_score context handler
    -fixes an issue with not invalidating lazy scores property
    -code quality fixes
    -query count optimization in PersistentSubscetionGrade.create
    -adds atomic blocks to avoid IntegrityErrors corrupting an entire request
 2016-08-25 11:43:49 -04:00
Jesse Zoldak
89430f5b4c Comment out flaky lettuce test. TNL-5315 2016-08-25 10:43:40 -04:00
Ned Batchelder
c55dcc3080 Update translations (autogenerated message) 2016-08-25 13:57:01 +00:00
Chris Rodriguez
f94e665e86 Fixing inline JS for CCX navigation 2016-08-25 09:07:08 -04:00
John Eskew
477d6dd236 Merge pull request #13309 from edx/release 
Hotfix for TNL-5365
 2016-08-25 08:54:38 -04:00
Qubad786
b25dc54d68 update library content block's children on branches 2016-08-25 16:44:52 +05:00
John Eskew
9af50a7550 Merge pull request #13310 from edx/feanil/revert_opaque_keys_update 
Revert "Bump opaque-keys version to 0.3.2"
 2016-08-24 20:37:24 -04:00
Feanil Patel
fba581f641 Revert "Bump opaque-keys version to 0.3.2" 
This reverts commit 5d150a39eb.

See ECOM-5345 for more details.
 2016-08-24 16:28:19 -04:00
John Eskew
aa8a63075c Merge pull request #13307 from edx/jeskew/add_integ_err_catch_csm 
Ignore IntegrityErrors upon set_many update save().
 2016-08-24 15:24:39 -04:00
Cliff Dyer
2e8e51c327 Merge pull request #13296 from edx/cdyer/oauth-admin 
Update django-oauth-toolkit admin
 2016-08-24 15:10:54 -04:00
John Eskew
87b4bcc731 Fix tests to account for savepoints caused by atomic wrapper. 2016-08-24 14:39:39 -04:00
John Eskew
211cef0814 Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:48:42 -04:00
J. Cliff Dyer
bd8a8babe2 Update django-oauth-toolkit admin 2016-08-24 13:31:11 -04:00
Sanford Student
20379c14c0 check for null doc 2016-08-24 13:18:28 -04:00
John Eskew
2252ce6abf Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:18:03 -04:00
Chris
bd79264226 Merge pull request #13150 from edx/clrux/ac-552-word-cloud 
AC-552 word cloud accessibility updates
 2016-08-24 13:08:06 -04:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
Waheed Ahmed
a81b3b36ea Merge pull request #13287 from edx/waheed/ecom-4186-fix-account-settings-tabpanel 
Fixed account settings tab-panels.
 2016-08-24 19:02:07 +05:00
Waheed Ahmed
0057815973 Fixed account settings tabpanels. 
ECOM-4186
 2016-08-24 18:11:40 +05:00
Matjaz Gregoric
008b708617 Merge pull request #12978 from open-craft/mtyaka/update-wiki 
Upgrade django-wiki to 0.0.9.
 2016-08-24 13:43:41 +02:00
Awais Jibran
84395dd8bd Merge pull request #13246 from edx/aj/tnl5111-discussion-blackout 
Fix Discussion blackout date still has Add a Response text box
 2016-08-24 14:52:58 +05:00
Awais Jibran
68303997c8 Fix Discussion blackout date still has Add a Response text box 
TNL-5111
 2016-08-24 12:03:29 +05:00
Matjaz Gregoric
c5f4ba0fa7 Upgrade django-wiki to 0.0.9. 
The new version fixes a problem where wiki fails with a 500 error when
combined org/course name/course run fields are longer than 50
characters.
 2016-08-24 08:43:38 +02:00
alisan617
a52cfd8636 Merge pull request #13292 from edx/alisan/inline-escape-sflint-TNL-5306 
Fix problem input error when inline is true
 2016-08-23 14:44:08 -04:00
sanfordstudent
a2b64d7504 Merge pull request #13262 from edx/sstudent/TNL-5006 
Trigger subsection grade update on SCORE_CHANGED signal
 2016-08-23 14:16:28 -04:00
Calen Pennington
fae18fd5e2 Merge pull request #13271 from cpennington/dont-translate-passthrough 
Don't use optparse's bad translation strings in passthrough_opts
 2016-08-23 13:23:21 -04:00
Sanford Student
b9dade5512 handler for SCORE_CHANGED signal 2016-08-23 13:12:36 -04:00
Jesse Zoldak
ea0f08d6f2 Merge pull request #13291 from edx/release 
Merging release branch to master from 2016-08-23 deploy
 2016-08-23 10:53:43 -04:00
alisan617
6ed5b2e3fc filter doinline escape string for inline css 2016-08-23 10:07:12 -04:00
Jesse Zoldak
d5c48e5585 Merge pull request #13283 from edx/rc/2016-08-23 
Release Candidate rc/2016-08-23
 2016-08-23 08:59:05 -04:00
Jesse Zoldak
c85d1a6dfb Merge pull request #13289 from edx/zoldak/TNL-5315 
Comment out flaky lettuce test. TNL-5315
 2016-08-22 22:18:10 -04:00
David Baumgold
c717829f26 Merge pull request #13290 from singingwolfboy/update-pa11ycrawler 
pa11ycrawler 1.2.0
 2016-08-22 17:10:12 -04:00