Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,043 Commits 1 Branch 0 Tags
60c2e45fbc02ef96f33bdd272b75d3ce89201aac
Commit Graph

6298 Commits

Author SHA1 Message Date
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
Matt Drayer
63ac2f1457 Merge pull request #9860 from edx/saleem-latif/SOL-1189 
SOL-1189: when a signature image file is uploaded, the preview image looks distorted
 2015-09-28 10:05:28 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers 
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
 2015-09-23 20:23:09 -04:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
Usman Khalid
158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-09-22 20:39:44 +05:00
Usman Khalid
1e799eb508 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-09-22 20:39:43 +05:00
Matt Drayer
5de93a3ad1 Merge pull request #9850 from edx/asadiqbal08/SOL-1188-fix 
asadiqbal08/SOL-1188-fix
 2015-09-22 11:38:00 -04:00
Jesse Zoldak
d9dbc1f24b Merge pull request #9793 from edx/zoldak/django-session-cookie 
Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting
 2015-09-22 09:28:42 -04:00
Saleem Latif
66283252e6 image stretched issue resolved in signatories 2015-09-22 11:41:52 +05:00
Jesse Zoldak
8a876a5ec3 Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting 2015-09-21 13:01:42 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
asadiqbal
3a2c97a02f SOL-1188 fix 2015-09-21 17:08:27 +05:00
Matt Drayer
58488eaa0b Merge pull request #9782 from edx/asadiqbal08/SOL-1188 
SOL-1188 Cancel button Saving not Canceling
 2015-09-20 23:01:34 -04:00
Matt Drayer
95da57ccf0 Merge pull request #9783 from edx/ziafazal/SOL-1226 
SOL-1226: scroll to top after saving
 2015-09-20 22:53:53 -04:00
Matt Drayer
ffb7f9b9a0 Merge pull request #9804 from edx/asadiqbal08/SOL-1224 
SOL-1224 Verified Preview not showing
 2015-09-20 22:50:00 -04:00
Bill DeRusha
271bc54071 Merge pull request #9765 from edx/bderusha/readonly-enrollment 
Readonly for enrollment end date/time on edX (for non-global-staff)
 2015-09-18 10:14:15 -04:00
Bill DeRusha
c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff) 
TNL-2694

Add accessibility aria-readonly attributes
 2015-09-18 09:39:18 -04:00
Sarina Canelake
07428c9ff6 Merge pull request #9247 from ubc/xcompass/pu/ubcpi 
Add Peer Instruction (PI) XBlock
 2015-09-18 09:06:30 -04:00
asadiqbal
287cc843df SOL-1224 2015-09-18 11:19:12 +05:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
Ned Batchelder
c0856232e1 Use sass interpolation instead of concatenation for -path 2015-09-17 15:39:04 -04:00
Ned Batchelder
5d64f9a80b Minor changes, responding to pull request comments 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Gabe Mulley
b56d4a0295 Revert "Fix order of tracking backends" 2015-09-17 15:04:21 -04:00
Gabe Mulley
034570b31a Merge pull request #9650 from edx/gabe/fix-backend-order 
Fix order of tracking backends
 2015-09-17 15:01:15 -04:00
Adam Palay
8aa23de55a add ability to delete published orphans from courses (PLAT-832) 
fix quality violations

create child parent mapping to avoid potential performance hit when deleting items
 2015-09-17 11:52:19 -04:00
Adam Palay
8834bbad90 delete_item should not delete any child that has a parent we do not intend to delete 2015-09-17 11:52:18 -04:00
Pan Luo
675d0e1413 Add Peer Instruction XBlock 2015-09-16 15:31:17 -07:00
Andy Armstrong
a1f0f12d03 Allow .html files in the static pipeline 
TNL-3296
 2015-09-16 16:54:30 -04:00
John Eskew
6b12ec97cc Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 16:23:52 -04:00
John Eskew
684f901760 Fix quality issue. 2015-09-16 16:04:51 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Matt Drayer
05a2b54b5a hotfix/2015-09-16-1: Removed signatory org char limit 2015-09-16 14:24:57 -04:00
Ned Batchelder
764cd862bd Mako comments have to be double-hash, or they are included on the page. 2015-09-16 11:24:18 -04:00
Zia Fazal
5effbf14f2 scroll to top after saving 
fixed broken bok choy tests
 2015-09-16 20:10:16 +05:00
asadiqbal
5ae0562e53 SOL-1188 2015-09-16 14:40:30 +05:00
Adam Palay
8dd95a8825 add test for fix_not_found 
(PLAT-835)
(TNL-844)
 2015-09-15 18:03:53 -04:00
David Baumgold
9cd6e6ffde Merge pull request #9764 from edx/db/i18n-course-rerun-strings 
Internationalize course re-run strings
 2015-09-15 14:30:59 -04:00
Matt Drayer
3adb26d95b mattdrayer/signatory-title-textarea: Increase form input limit to 106 characters 2015-09-15 11:55:08 -04:00
David Baumgold
61419cefa5 Re-word translators comment 2015-09-15 11:24:46 -04:00
David Baumgold
9b34ab51bd Break translators comments across multiple lines 2015-09-15 11:24:43 -04:00
Christine Lytwynec
60c32778b6 Merge pull request #9682 from edx/clytwynec/AC-163 
Make studio forgot password link focusable
 2015-09-15 10:27:22 -04:00
David Baumgold
4dbd81451f Internationalize course re-run strings 2015-09-15 10:19:55 -04:00
John Eskew
6454ffc3b1 Merge pull request #9734 from edx/jeskew/replace_remove_persistent_factory 
Refactor the test_crud file.
 2015-09-15 09:05:43 -04:00
Matt Drayer
60a8531348 mattdrayer/signatory-title-length: Bump to 106 characters 
* Fix typo
* Fix odd test inputs
 2015-09-14 17:19:02 -04:00