Commit Graph

1471 Commits

Author SHA1 Message Date
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:54:49 -04:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy
Configure youtube stub for bok-choy
2014-04-28 17:32:33 +05:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
1192b5f7c9 Make dispatch logic clearer 2014-04-25 12:11:20 -07:00
John Cox
c80b596890 Fix two error message corner cases 2014-04-25 12:11:20 -07:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
jsa
f71e78b69f add acceptance tests for user profile pagination.
JIRA: FOR-492
2014-04-24 13:47:03 -04:00
David Baumgold
6773105264 Merge pull request #3425 from edx/pk-set-can-be-none
pk_set can be None
2014-04-23 15:30:37 -04:00
John Jarvis
27256bbbb4 Merge pull request #3396 from edx/jarv/change_enrollment_cmd
adding django admin command to change enrollment
2014-04-23 09:44:46 -04:00
David Baumgold
8351869346 Fixes #3409 2014-04-22 13:30:49 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master
make embargo template theme-able
2014-04-22 10:04:08 -07:00
John Jarvis
67128c5ff8 grammar 2014-04-18 10:13:23 -04:00
John Jarvis
b67987cd43 fixing example 2014-04-18 10:12:47 -04:00
John Jarvis
27104c93ea adding django admin command to change enrollment 2014-04-18 10:07:18 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Waqas Khalid
70b525e259 Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name
fix change name view by replacing the request.user simple lazy object wi...
2014-04-14 17:55:26 +05:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Waqas Khalid
43377af85a fix change name view by replacing the request.user simple lazy object with request.user.id
LMS-2479
2014-04-11 18:36:49 +05:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination
Add repsonse pagination to inline discussions
2014-04-09 17:55:15 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -04:00
Valera Rozuvan
b2543bfa95 Tweaking automatic screenshots in acceptance tests. 2014-04-09 11:37:32 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542
Change behavior of cohort addition interface
2014-04-07 12:54:38 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
2014-04-07 11:40:51 -04:00
Waheed Ahmed
c0b50c7f62 Change user.is_authenticated to user.is_authenticated() in roles.py.
LMS-2442
2014-04-07 12:20:20 +05:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements
Add some optional policies around password resets, such as password reus...
2014-04-04 16:14:43 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
David Baumgold
a8b77b99dd Merge pull request #3171 from abdoosh00/unicode-fixes
unicode fixes
2014-04-02 10:45:28 -04:00
Abdallah
bb9f720fa6 unicode fixes 2014-04-02 16:18:56 +03:00
louyihua
80e1270587 Make new-style chinese language codes works for translation
The old-style chinese language codes used in django 1.4 series are now deprecated, as discussed here:  https://code.djangoproject.com/ticket/18419.
Although majority of browsers still use the old-style language codes, some new browsers such as IE11 in Windows 8.1 start to use the new-style names instead of old-style ones which makes the current chinese translations of edX can't work properly under these browsers.
As there is no easy way for edX to change a higher version of django, I think we could do some mapping here so that the users who use IE11 in Windows 8.1 or other browsers that use the new-style names can view correct translations.
Also, this fix will make users who use one of the language codes:  zh-hk ,  zh-sg  and  zh-mo  can see the correct translations.
2014-04-02 13:12:44 +08:00
Calen Pennington
c54972e855 Fix bad interaction between pluggable InputTypes and Microsites
Pluggable InputTypes use edxmako.paths.add_lookup to inject new
mako template directories. Those were getting clobbered by microsites
(and by theming), which were completely rebuilding the mako template
lookup list from scratch.

This commit switches those two features to use the same add_lookup
function as pluggable InputTypes.

[LMS-2489]
2014-04-01 16:49:15 -04:00
Calen Pennington
9bcbba6750 Emit datadog events for all course enrollments, not just those outside of verified courses 2014-04-01 13:02:29 -04:00
Chris Dodge
ff8a0c6891 password history: just limit the result set range to simplify iteration logic 2014-03-31 10:30:58 -04:00
Chris Dodge
d5bb1b5cca Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets 2014-03-31 10:30:58 -04:00
Calen Pennington
81a038cbaf Add datadog metrics logging for django model creates, updates, and deletes 2014-03-28 14:45:59 -04:00
Usman Khalid
e1afbe5011 Merge pull request #3058 from edx/usman/lms2429-unicode-error-fixes
Unicode support fixes
2014-03-28 20:08:27 +05:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
2014-03-28 10:34:34 +02:00
Valera Rozuvan
b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc
Update doc string for YouTube stub server.
2014-03-28 09:15:35 +02:00
Dave St.Germain
a6bde7cc9e Fix broken test due to refactoring. 2014-03-27 16:44:07 -04:00
Dave St.Germain
0501775d64 Add an option to prevent multiple logins of the same user. 2014-03-27 16:05:25 -04:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server.
Included information on how to launch the server
on its own.
EOF
2014-03-27 21:21:38 +02:00
Usman Khalid
7323341a4b Changed str->unicode in common/djangoapps/utils/.
LMS-2436
2014-03-25 20:43:12 +05:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module.
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
2014-03-19 19:30:45 +02:00
jsa
fb57ffb80a in create_user mgmt command, use settings.LANGUAGE_CODE instead of en-us.
Fixes the create_user admin command, which was creating user accounts
with a potentially invalid language preference.

JIRA: FOR-532
2014-03-18 15:28:07 -04:00
Calen Pennington
58f05f3687 Merge pull request #2840 from ionis-education-group/double-edxmako-startup
Add method to clear mako template lookups
2014-03-18 14:31:13 -04:00
Jim Abramson
32fd073760 Merge pull request #2957 from edx/jsa/forum-user-sync
Ensure account creation succeeds before creating comments service user
2014-03-18 14:07:44 -04:00