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

28660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Sadecki
bf7f7e1425 Merge pull request #6968 from edx/cptvitamin/TNL-891-alt-on-spinner 
adds and alt attribute to the loading/spinner graphic
 2015-02-20 09:42:31 -05:00
Anton Stupak
2ff863cbdd Merge pull request #6778 from edx/jmclaus/edxnotes-add-a11y 
TNL 713: Added accessibility plugin.
 2015-02-20 14:33:04 +02:00
Anton Stupak
ca8bfa84e7 Merge pull request #6941 from edx/anton/fix-flaky-tests 
TNL-454: Fix flaky bok-choy tests.
 2015-02-20 14:31:42 +02:00
Muzaffar yousaf
dfaae534ba Merge pull request #6707 from edx/muzaffar/content-groups-tnl1185 
Content Groups Usage and Delete functionality.
 2015-02-20 17:18:46 +05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms. 
TNL-1185
 2015-02-20 14:56:22 +05:00
Jean-Michel Claus
7cb495a166 TNL 713 (TNL-714, TNL-717, TNL-718): Added accessibility plugin. 2015-02-19 19:02:57 +02:00
Christina Roberts
985a492efd Merge pull request #4891 from aboudreault/discussion-digest-default 
Add ENABLE_DISCUSSION_EMAIL_DIGEST feature
 2015-02-19 10:36:59 -06:00
Jesse Zoldak
18a916bafd Merge pull request #7026 from edx/zoldak/skip-flaky-transcripts 
Disable flakily failing JS tests TNL-559
 2015-02-19 08:40:16 -05:00
Waheed Ahmed
87147d79e3 Merge pull request #7015 from edx/waheed/tnl1459-fix-save-matlab-message 
Fixed save matlab problem response message.
 2015-02-19 17:54:16 +05:00
polesye
4b551b5357 TNL-454: Fix flaky bok-choy tests. 2015-02-19 14:43:34 +02:00
Jesse Zoldak
44ff43ab1f Disable flakily failing JS tests TNL-559 2015-02-19 07:24:27 -05:00
Waheed Ahmed
8f5dd63e9f Fixed save matlab problem response message. 
TNL-1459
 2015-02-19 15:17:28 +05:00
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
Will Daly
0e3f40b948 Merge pull request #7024 from edx/will/ecom-1088 
ECOM-1088: Student has re-verified but dashboard is still displaying 'honor code'
 2015-02-18 14:09:29 -05:00
Mark Sadecki
8b79d94064 adds and alt attribute to the loading/spinner graphic 2015-02-18 14:05:11 -05:00
Mark Sadecki
002dc0f553 Merge pull request #6926 from edx/cptvitamin/TNL-1371-fieldset-no-legend 
[TNL-1371] Adds a SR only legend for fieldset and translates
 2015-02-18 13:43:10 -05:00
Will Daly
ad1cf355e9 Merge pull request #7007 from edx/will/ecom-859-take-three 
ECOM-859: Add support for an input image capture.
 2015-02-18 12:59:26 -05:00
Will Daly
e4711062a3 ECOM-1088: Student has re-verified but dashboard is still displaying 'honor code' 
Handle the case in which a student reverifies after the verification
deadline has passed.  This will display the user's status as "verified"
on the dashboard even if they technically missed the deadline.
 2015-02-18 12:05:19 -05:00
Waheed Ahmed
9cf9f05a3d Merge pull request #6983 from edx/waheed/tnl1419-fix-optioninput-if-options-created-with-variables 
Fixed optioninput problem, option was not remain selected after submitting.
 2015-02-18 21:47:06 +05:00
Will Daly
a29662cdbc ECOM-859: Add support for an input image capture. 
Add support for HTML Media Capture (file input)
so that iOS users can use the camera.
 2015-02-18 11:10:41 -05:00
Will Daly
dca2b95e60 Merge pull request #7010 from edx/will/ecom-1060 
ECOM-1060: Logistration third-party auth improvements
 2015-02-18 10:07:43 -05:00
Sarina Canelake
1fb580e3ef Merge pull request #6938 from mitocw/bdero/gitlog-pagination 
Add pagination to sysadmin dashboard Git import logs
 2015-02-18 10:04:22 -05:00
Sarina Canelake
08a74a5aca Merge pull request #7003 from schoolyourself/schoolyourself-xblock 
Update schoolyourself-xblock CSS to wrap long title text on small screens
 2015-02-18 08:57:13 -05:00
Waheed Ahmed
0086893ddd Fixed option was not remain selected after submitting. 
TNL-1419
 2015-02-18 18:50:32 +05:00
Sarina Canelake
73c309935b Merge pull request #6679 from open-craft/problem-tooltips 
Support for inline explanatory popups in problem XML
 2015-02-18 08:37:03 -05:00
Muzaffar yousaf
3b883d1777 Merge pull request #7014 from edx/muzaffar/update-edxsubmission-tnl1466 
Updates the edx-submissions version.
 2015-02-18 17:48:24 +05:00
Shrhawk
24a63dadf9 Merge pull request #6694 from edx/shr/bug/TNL-1202-HD-button-not-working-properly 
Hd button on for default high resolutions
 2015-02-18 14:11:27 +05:00
muzaffaryousaf
4a13656864 updating the edx-submission version. 
adding myself to authors.

TNL-1466
 2015-02-18 13:12:21 +05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Syed Hassan Raza
44468f840e Hd button on for default high resolutions 
TNL-1202
 2015-02-18 12:49:27 +05:00
Brandon DeRosier
367dc2573b Test multi-page gitlogs 2015-02-18 01:58:53 -05:00
Sarina Canelake
c6aa4416c4 Merge pull request #7012 from edx/sarina/validate-update 
Update i18n-tools to fix dummy generation
 2015-02-17 21:42:28 -05:00
Sarina Canelake
b1d2c5c396 Update i18n-tools to fix dummy generation 2015-02-17 17:42:11 -05:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Will Daly
a5f173dfcc ECOM-1060: Logistration third-party auth improvements 
When the user returns to the registration page with a current
third party auth provider, hide the third party auth buttons
are hidden, including the
"or create a new one here" text that does not make sense
when the buttons are hidden.
 2015-02-17 14:48:53 -05:00
Clinton Blackburn
6b56ae6ae6 Merge pull request #6154 from edx/clintonb/courses-api 
Courses API
 2015-02-17 14:19:40 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Sarina Canelake
2a8b71486b Merge pull request #7005 from edx/sarina/20150217-translation-update 
Update translations (autogenerated message)
 2015-02-17 12:56:49 -05:00
Sarina Canelake
793a472628 Merge pull request #6962 from Stanford-Online/giulio/course-price-bugfix 
BUGFIX: shopping_cart_enabled + cosmetic price
 2015-02-17 12:56:16 -05:00
Sarina Canelake
f6e8867457 Update translations (autogenerated message) 2015-02-17 11:54:13 -05:00
Will Daly
cec3484184 Merge pull request #6969 from edx/will/ecom-1055 
ECOM-1055: Add messaging for when a student's verification will expire before the deadline
 2015-02-17 10:57:57 -05:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price 
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
 2015-02-17 07:50:59 -08:00
John Lee
41a457d359 Update schoolyourself-xblock CSS to wrap long title text 2015-02-17 10:34:48 -05:00
Waqas Khalid
d6efd1285c Merge pull request #6996 from edx/waqas/tnl1390-missing-discussion-blackout 
Missing discussion blackout throwing exception
 2015-02-17 20:23:40 +05:00
Will Daly
6796b07d56 Add messaging for when a student's verification will expire before the deadline. 2015-02-17 09:55:29 -05:00
Muzaffar yousaf
4dd9cd2c19 Merge pull request #6978 from edx/muzaffar/mongo-split-fix-tnl1185 
Adding the support for '$exists' into the get_items for split mongo.
 2015-02-17 18:18:46 +05:00
muzaffaryousaf
f0cfc93a5a Adding the support for '$exists' into the get_items for split mongo. 
TNL-1451
 2015-02-17 17:13:51 +05:00
Usman Khalid
618d8ba33c Merge pull request #6980 from edx/usman/ora-release-2014-02-12 
Update edx-ora2 to release-2015-02-12T15.27.
 2015-02-17 17:00:32 +05:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
stv
01bd96512a Remove shadowed class declaration 
It looks like one version of the class was first added [1] and then a
few days later, another was written [2]. The newer declaration appeared
lower in the file, allowing it to hide the other.

This removes the first, hidden declaration.

[1] commit 7aa493ec85
    Date:   Fri Mar 1 10:36:20 2013 -0500
[2] commit f62dad2f57
    Date:   Tue Mar 5 16:31:02 2013 -0500
 2015-02-16 22:55:22 -08:00