Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,719 Commits 1 Branch 0 Tags
17c8fa81f52b7708643a97c8d774b439337c00a7
Commit Graph

1788 Commits

Author SHA1 Message Date
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Waheed Ahmed
a1e911ae39 Fixed InvalidKeyError in course handler in studio. 
LMS-11141
 2014-09-12 15:16:36 +05:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. 
TNL-186
 2014-09-11 13:51:34 -04:00
Julia Hansbrough
3a0dea20e1 Merge pull request #5168 from edx/flowerhack/third-party-stats 
Flowerhack/third party stats
 2014-09-11 11:04:38 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Julia Hansbrough
059d0dfff3 Login analytics 2014-09-11 13:53:29 +00:00
zubair-arbi
27c29d0dfd Merge pull request #5140 from edx/zub/bugfix/plat-101-playercontrolsnotvisible 
show video controls for all youtube videos
 2014-09-11 17:35:49 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos 
TNL-184
 2014-09-11 17:02:27 +05:00
chrisndodge
789193ef10 Merge pull request #5166 from edx/cdodge/hotfix-disable-social-auth-for-white-labels 
make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware
 2014-09-10 16:52:57 -04:00
Don Mitchell
534d1b52f2 Merge branch 'release' 2014-09-10 12:40:43 -04:00
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
Will Daly
541419e362 Merge pull request #5141 from edx/will/fix-embargo-tests 
Fix embargo middleware with tests
 2014-09-10 07:58:23 -04:00
Will Daly
512db7be99 Fix embargo middleware with tests 2014-09-09 08:50:10 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Renzo Lucioni
12d5c9b281 Do not call upper on a profile country code of None 2014-09-08 17:33:02 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Renzo Lucioni
c3359135e7 Refrain from accessing country code if country is None 2014-09-05 10:58:18 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" 
This reverts commit 371dfd6187.
 2014-09-05 10:51:51 -04:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling 
Course Rerun: include stack trace in errors and Log errors.
 2014-09-04 16:25:43 -04:00
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128" 
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
 2014-09-04 16:01:28 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Julia Hansbrough
0dea82e43e Analytics should use user.id not anon id 2014-09-04 09:03:55 -04:00
Jason Bau
4d5a2380f1 external_auth: handle request.META values as str, not unicode 2014-09-03 12:07:35 -07:00
Renzo Lucioni
9219cbdca8 Fix 3rd party auth string interpolation, address design feedback 2014-09-03 10:51:34 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Stephen Sanchez
2f4fb30592 Cleaning up ddt syntax for new footer test. 2014-09-02 13:14:28 +00:00
Stephen Sanchez
75d6f99fed The main django template needs header and footer feature flags. 2014-09-02 12:08:22 +00:00
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party 
Facebook auth support.
 2014-08-30 02:50:57 -04:00
Jesse Zoldak
96153ceed0 Revert "The main django template needs header and footer feature flags." 2014-08-29 16:43:30 -04:00
Will Daly
5cc6455fe3 Merge pull request #5006 from edx/will/ecom-199 
ECOM-199: Auto-registration bugfix
 2014-08-29 16:33:20 -04:00
Julia Hansbrough
fd925e8970 Add server-side analytics logging for login 
Also, removed the client-side analytics for logging in.
Ensures that analytics are collected for third-party-auth logins.
Fixed failing tests related to third-party-auth.
 2014-08-29 19:49:42 +00:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
Will Daly
9d4bf89058 Exclude courses from the auto-registration A/B test 2014-08-29 08:24:04 -04:00
Waheed Ahmed
048984ba1d Fixed InvalidKeyError on change enrollment. 
LMS-11132
 2014-08-29 14:45:54 +05:00
Daniel Friedman
8a7fef072d Merge pull request #4937 from edx/dan-f/improve-course-group-coverage 
Improve test coverage for course groups
 2014-08-28 19:08:56 -04:00
Sarina Canelake
64c94cf3cf Merge pull request #4686 from Stanford-Online/stv/i18n/gettext 
Monkey patch 'django.utils.translation'
 2014-08-28 17:39:51 -04:00
Daniel Friedman
a01e57ee71 Improve test coverage for course groups 2014-08-28 17:07:22 -04:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session 
Update devstack settings to use new CyberSource API
 2014-08-28 13:55:31 -04:00
Will Daly
3af9943de8 Bugfix for ECOM-199: Visitors removed from auto-enroll pool if they need to authenticate while attempting to enroll 
Sets a session variable as soon as a user enters the experimental condition to ensure that they stay in that condition,
even if they later access the control URL (e.g. from a redirect on the login page)
 2014-08-28 12:24:00 -04:00
Will Daly
fcc27003dc Pep8 and Pylint fixes to the student tests 2014-08-28 08:05:36 -04:00
stv
86633df3db Monkey patch 'django.utils.translation' 
Modify Django's translation library, such that the gettext family of
functions return an empty string when attempting to translate a
falsey value. This overrides the default behavior [0]:
> It is convention with GNU gettext to include meta-data as the
> translation for the empty string.

This patch provides a holistic solution to replace the current piecemeal
approach [1][2].

Affected Methods:
    - gettext
    - ugettext

[0] https://docs.python.org/2.7/library/gettext.html#the-gnutranslations-class
[1] bad803e451
[2] https://github.com/edx/edx-platform/pull/4653
 2014-08-27 15:27:34 -07:00
Will Daly
a03baee25c Merge pull request #4976 from edx/will/ecom-128 
Embargo based on country code in the user's profile.
 2014-08-27 11:24:26 -04:00