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

38298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Cliff Dyer
bd8a8babe2 Update django-oauth-toolkit admin 2016-08-24 13:31:11 -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
David Baumgold
e267b93e4e pa11ycrawler 1.2.0 2016-08-22 16:03:48 -04:00
Chris
9cf613d2f1 Merge pull request #13288 from edx/clrux/rc/2016-08-23-ac-530-notes-fix 
RC fixup for student notes button
 2016-08-22 14:14:35 -04:00
Jesse Zoldak
d642b6ad67 Comment out flaky lettuce test. TNL-5315 2016-08-22 14:05:57 -04:00
Eric Fischer
719dff66fb Merge pull request #13093 from edx/beryl/grading 
Use Persistent Subsection Scores in Grading
 2016-08-22 13:57:30 -04:00
Malik Shahzad
dca9ea7a33 Merge pull request #13278 from edx/malikshahzad228/SOL-2017 
(WIP) SOL-2017: Unused code removed.
 2016-08-22 19:43:46 +05:00
Chris Rodriguez
1505c1b32e RC fixup for student notes button 2016-08-22 10:35:33 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Tasawer Nawaz
91e3847058 Merge pull request #13244 from edx/tasawer/bugfix/ecom-5184-incorrect-attr-on-id-verification-button 
Removed incorrect aria tag from ID photo submission button
 2016-08-22 12:41:49 +05:00
Waheed Ahmed
8a522b898a Merge pull request #13245 from edx/waheed/ecom-4188-fix-focus-on-tab-remain-within-modal 
Fixed keyboard focus remains within modal simulated dialogs.
 2016-08-20 15:17:55 +05:00
Waheed Ahmed
3c84b7a12c Fixed keyboard focus remains within modal simulated dialogs. 
ECOM-4188
 2016-08-20 13:45:32 +05:00
Andy Armstrong
e86ff28f14 Merge pull request #13260 from edx/bjacobel/discussions-markdown 
A11Y fixes for discussions markdown editor
 2016-08-19 18:13:29 -04:00
Brian Jacobel
50dab15888 Use real buttons for WMD buttons 
TNL-5161
 2016-08-19 17:07:18 -04:00
Jesse Zoldak
ce0009ab94 Merge pull request #13282 from edx/zoldak/lettuce-fasttest 
test_acceptance paver command option fasttest should not recompile sass
 2016-08-19 15:20:09 -04:00
Jesse Zoldak
99a7c555ab test_acceptance paver command option fasttest should not recompile sass 2016-08-19 13:21:16 -04:00
Douglas Hall
a6648559f7 Merge pull request #13001 from edx/hasnain-naveed/WL-474/boilerplate 
WL-474 | Example Theme
 2016-08-19 11:41:00 -04:00
Chris
700ccfaba1 Merge pull request #12993 from edx/clrux/ac-530 
AC-530 fixing link-href ignores in the platform
 2016-08-19 11:16:38 -04:00
Chris Rodriguez
b5efcc15f5 AC-530 fixing link-href ignores in the platform 2016-08-19 10:04:40 -04:00
hasnain naveed
72581a08ce WL-474 | theme boilerplate 2016-08-19 09:18:52 -04:00
Malik Shahzad
062230b6a4 SOL-2017: Unused code removed. 2016-08-19 16:03:57 +05:00
Tasawer
24ea7dc1b1 Removed incorrect aria tag from ID photo submission button 
ECOM-5184
 2016-08-19 11:47:59 +05:00
alisan617
a250b03b60 Merge pull request #13274 from edx/alisan/TNL-5289-python-evaluated-input 
trailing text remove its parent class that doesn not exist in python …
 2016-08-18 15:17:59 -04:00
alisan617
90d7141c20 Merge pull request #12853 from eduNEXT/Bound3R/TNL-3717 
resolve byte-sized bug TNL-3717
 2016-08-18 14:31:41 -04:00
Ned Batchelder
594e75c4ab Merge pull request #13273 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-08-18 14:01:15 -04:00
Ned Batchelder
411219aac8 Update translations (autogenerated message) 2016-08-18 17:05:20 +00:00
Brian Jacobel
7e12a1f7ae Merge pull request #12771 from edx/discussion-forums-ui-update 
Discussion forums UI update feature branch
 2016-08-18 12:58:54 -04:00
alisan617
289ab1476d trailing text remove its parent class that doesn not exist in python input type 2016-08-18 12:57:27 -04:00
Albert (AJ) St. Aubin
2926400798 Merge pull request #13269 from edx/TNL-5298_flaky_test 
Update to deal with flaky test
 2016-08-18 12:23:25 -04:00
Cliff Dyer
747c9a4de8 Merge pull request #13143 from edx/efischer/grades 
Persistent Grades Data Model
 2016-08-18 12:17:08 -04:00
Renzo Lucioni
40ca3efd6c Merge pull request #13272 from edx/release 
Merge release into master
 2016-08-18 12:04:39 -04:00
Renzo Lucioni
4fb0d38c4d Merge pull request #13265 from edx/renzo/fix-dashboard-unicode-error 
Fix Unicode error on dashboard
 2016-08-18 11:16:51 -04:00
PaulWattenberger
910c5b88b1 Merge pull request #13266 from edx/pwattenberger/ECOM-5297 
Handle vars: None in Sailthru user record in unenroll list update
 2016-08-18 11:00:40 -04:00
Calen Pennington
abe6ef4525 Don't use optparse's bad translation strings in passthrough_opts 2016-08-18 10:59:45 -04:00