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

11954 Commits

Author SHA1 Message Date
Ned Batchelder
60c2e45fbc Added autospec=True to mocks being used incorrectly. 
The tests now fail!
 2015-09-29 06:56:30 -04:00
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
Marco Morales
ad5aab4cc1 Merge pull request #9666 from edx/marco/UX-2586/discussions-profile-photos 
Discussion post cleanup (in preparation for post author images support)
 2015-09-28 09:12:42 -04:00
Syed Hasan raza
d570866c69 Merge pull request #9432 from edx/shr/bug/PLAT-799-prevent-published-orphan-creation 
Prevent publish orphans
 2015-09-28 02:16:25 -07:00
Christine Lytwynec
80dafc2133 Merge pull request #9506 from edx/clytwynec/AC-157 
Manage focus on delete component modal
 2015-09-25 08:58:26 -04:00
Braden MacDonald
b98956bdf6 Merge pull request #9672 from open-craft/tpa-providers-api 
Initial implementation of API for listing a user's third party auth providers
 2015-09-24 15:52:52 -07:00
Christine Lytwynec
2dc5b8e89c make verifyElementInFocus a ViewHelpers method 2015-09-24 16:25:49 -04:00
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon 
Update Sinon library
 2015-09-24 13:17:03 -04:00
Eric Fischer
cf5d5666a3 Merge pull request #9794 from edx/efischer/prevent_doubleclick 
TNL 3294 - Prevent double click creating multiple teams
 2015-09-24 11:01:43 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Ned Batchelder
45176c7254 Merge pull request #9868 from louyihua/i18n_fix 
i18n fix
 2015-09-24 10:23:58 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 
saleem-latif/SOL-565
 2015-09-24 10:19:43 -04:00
Eric Fischer
02b72abccb Disable button while running 
Now using withDisabledElement to prevent multiple event handling. I've
attempted to write this as a common function in view_utils, so that this
approach can be used more generally, wherever needed. Includes a unit test.

Thanks to Christina and Andy for all their help on this one.
 2015-09-24 10:13:30 -04:00
louyihua
66678c103f i18n fix 
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
 2015-09-24 13:02:12 +08: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
Andy Armstrong
7280a58711 Merge pull request #9885 from edx/andya/teams-router-testing 
Improve team testing of routers
 2015-09-23 19:53:30 -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
clrux
0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 
LMS: Course navigation revamp
 2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Andy Armstrong
d09034e065 Improve team testing of routers 2015-09-23 13:10:46 -04:00
Bill DeRusha
d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync 
Add mailchimp list fields and config for new users
 2015-09-23 12:44:57 -04:00
Syed Hassan Raza
3849a8fa81 prevent delete public oprhans 2015-09-23 05:53:42 -07:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Sarina Canelake
d8d49f7544 Merge pull request #9606 from Colin-Fredericks/ColinF-PC-not-dropdown 
TNL-3197 Partial Credit (not Dropdown)
 2015-09-22 15:10:13 -04:00
Jim Abramson
358f8056dd Merge pull request #9345 from open-craft/smarnach/enrollment-api 
Allow staff users to request a list of courses a student is enrolled in via the Enrollment API.
 2015-09-22 13:22:50 -04:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown) 
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
 2015-09-22 13:20: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
Bill DeRusha
ccc43cfe98 Add mailchimp list fields and config for new users 2015-09-22 10:24:24 -04:00
Clinton Blackburn
8cd297ec08 Merge pull request #9816 from edx/clintonb/admin-updates 
Additional Admin Updates
 2015-09-21 15:34:02 -04:00
Christine Lytwynec
f96d4b7142 Manage focus on modal confirmation prompt 2015-09-21 13:36:02 -04:00
Mike Bifulco
13c6550aea fix label for check/final check 
This label hadn't been updated to change its message depending on whether students were on their "final" submission attempt.
 2015-09-21 12:12:49 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Sarina Canelake
9a0152724b Merge pull request #9846 from edx/sarina/tooltips 
Make LMS courseware tooltips better
 2015-09-21 10:32:07 -04:00
Sarina Canelake
94b73dc921 Remove blank lines from tooltip display 2015-09-21 09:29:24 -04:00
Marco Morales
ad465d6ba6 Discussion forum styling cleanup to correct current visual styling issues in addition to cleaning up styles in preparation for adding post images 2015-09-21 09:24:47 -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
clrux
dfaef63595 Merge pull request #9140 from edx/clrux/ux-2620-new-post-focus 
Assigning focus to the selected topic
 2015-09-19 11:52:19 -04:00
Sarina Canelake
eb2be53876 Merge pull request #9639 from jolyonb/feqtext 
Adding trailing_text to formulaequationinput
 2015-09-18 14:05:19 -04:00
Brian Talbot
2797ebc0e8 fixup! simplifying needed sass assets for xmodule sass compilation 2015-09-18 12:32:31 -04:00
Peter Fogg
aacd239b41 Merge pull request #9813 from edx/peter-fogg/verified-track-message-update 
Update verified track message.
 2015-09-18 11:43:57 -04:00
Peter Fogg
547844c0f4 Update verified track message. 
ECOM-2300
 2015-09-18 10:52:37 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +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
Kevin Falcone
dbc0803fc9 Quality fix (team isn't used) 2015-09-17 17:53:11 -04:00
Chris Rodriguez
f63ff69097 Assigning focus to the selected topic 
TNL-2620
 2015-09-17 17:31:30 -04:00
Ned Batchelder
027a571957 Import the correct scss files for xmodule styling 2015-09-17 17:22:51 -04:00