Commit Graph

10029 Commits

Author SHA1 Message Date
Don Mitchell
d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides
make asides render in studio
2014-12-18 15:41:58 -05:00
Stephen Sanchez
0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer
Enrollment API Cleanup
2014-12-18 11:00:23 -05:00
stephensanchez
22a18e350d Updating the design of the DRF views for enrollments.
Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
2014-12-18 15:39:01 +00:00
Waheed Ahmed
2ffe6032bf Fixed CodeMirror editor view height in studio.
TNL-920
2014-12-18 11:42:18 +05:00
chrisndodge
f733d1d8bd Merge pull request #6234 from edx/afzaledx/WL-172-order-history
WL-172 Show a Order History list on the Student Dashboard for any PaidCo...
2014-12-17 20:46:54 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Don Mitchell
4360a78142 Studio render XBlockAside views
PLAT-280
2014-12-17 15:44:49 -05:00
Don Mitchell
de5e88561f Make XmlModuleStore handle asides
PLAT-221
2014-12-17 13:51:10 -05:00
Diana Huang
cb7f725d2d Merge pull request #6282 from edx/diana/kill-courseware-bi-events
Remove Segment events from courseware.
2014-12-17 11:26:06 -05:00
Waqas Khalid
c7fde04433 Merge pull request #6067 from mlkwaqas/waqas/tnl107-changing-pages-not-reposition
In user profile changing page should reposition window to top
2014-12-17 19:58:28 +05:00
Oleg Marshev
8260bee9c3 Merge pull request #6266 from mitocw/fix_lti_callback
OAuth signature should be verified against URL provided to the tool.
2014-12-17 16:53:48 +02:00
Waqas Khalid
efbeb9212b Merge pull request #5993 from mlkwaqas/waqas/tnl752-discussion-id-should-be-unique
Advanced settings discussion category ids should be unique.
2014-12-17 18:25:36 +05:00
Ivica Ceraj
daa1797fc4 OAuth signature should be verified against URL provided to the tool.
There is possibility that a proxy will change URL along the way (for
example protocol from https to http) which would invalidate signature.
Supporting LTI_1 and LTI_2 use case.
2014-12-17 08:11:11 -05:00
Waqas Khalid
0eab14a334 In user profile changing page should reposition window to top
When we change the page using pagination in the user
profile page the data gets updated but the position
of the window remains at pagination. It should change
position of window to top.

TNL-107
2014-12-17 17:22:10 +05:00
Waqas Khalid
d9d8775757 Advanced settings discussion category ids should be unique.
If the ids in the adnvaced setting discussion category are
not unique then threads under categories with different name
will come in every category with same id. Ids should be unique
inorder to differentiate between different categories.

TNL-752
2014-12-17 17:20:48 +05:00
Waheed Ahmed
d23e772dd0 Fixed unicode problem if transcript file is not UTF-8 encoded.
TNL-527
2014-12-17 13:19:47 +05:00
Diana Huang
26fd9d23e8 Remove Segment events from courseware. 2014-12-16 16:53:06 -05:00
John Eskew
b518cfa0a0 Add wrapper class that enables storage of Mongo document id separately
from dictionary of all asset metadata by asset type.
2014-12-16 15:42:38 -05:00
John Eskew
94ea35d3be Export modulestore-stored asset metadata as XML to exported course.
Import asset metadata XML into modulestore.
Optimize importing many items of asset metadata by avoiding multiple
round-trips to MongoDB.
2014-12-16 15:42:38 -05:00
John Eskew
e66cb05c03 Return empty values and log a warning instead of raising NotImplemented
exceptions for XML modulestore asset metadata methods.
2014-12-16 15:42:38 -05:00
zubair-arbi
5371d17312 Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error
fix location revision error for multi parent draft
2014-12-16 19:39:27 +05:00
Ben Patterson
a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init
Mock out the underlying segment-io call.
2014-12-15 13:44:54 -05:00
zubair-arbi
99b86d7b0f fix location revision error for multi parent draft
PLAT-332
2014-12-15 17:32:48 +05:00
zubair-arbi
1d6d2f2a7f set position to default value if POST request don't have position argument
TNL-922
2014-12-15 11:59:52 +05:00
Calen Pennington
822eaa20c6 Make ErrorDescriptor more resistent to errors 2014-12-13 08:26:28 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Ben Patterson
7be7b50ba9 Mock out the underlying segment-io call.
TE-532
2014-12-12 21:47:43 -05:00
Calen Pennington
ccbff2dafc Make a generic django field for storing OpaqueKey classes 2014-12-12 21:45:21 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8
Update pep8 to 1.5.7
2014-12-12 15:00:13 -05:00
David Baumgold
48c349ffde Re-add and clarify comment 2014-12-12 14:19:49 -05:00
Sarina Canelake
2e5b96768a Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub
Implements keyword sub feature for bulk emails
2014-12-12 12:57:21 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary
Check settings.FEATURES["ADVANCED_SECURITY"] first
2014-12-12 11:53:02 -05:00
Jesse Zoldak
b999714e1d Merge pull request #6111 from edx/zoldak/modulestore-test-config
Unit test speed improvements
2014-12-12 10:53:24 -05:00
Shrhawk
cc377e8c38 Merge pull request #6211 from Shrhawk/shr/bug/TNL-964-navbar-display-display-issue
Fix white spaces inside navigation
2014-12-12 11:52:55 +05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
njdup
32bbb0e71a Implements keyword sub feature for bulk emails
This commit pulls in changes from #4487 that implements keyword
substitution for bulk emails. With these changes, an instructor can
include keywords in their bulk emails which will be automatically substituted
with the corresponding value for the recepient of the email. Keywords are
of the form %%keyword%%, and the keywords implemented in this commit include:

%%USER_ID%% => anonymous_user_id
%%USER_FULLNAME%% => user profile name
%%COURSE_DISPLAY_NAME%% => display name of the course
%%COURSE_END_DATE%% => end date of the course

Client-side validations have also been implemented to ensure that only emails
with well-formed keywords can be sent.
The architecture is designed such that adding in new keywords in the future
would be relatively straight-forward.
2014-12-11 15:03:29 -08:00
Clinton Blackburn
b1e5002b6b Merge pull request #6224 from edx/release
hotfix-2014-12-11
2014-12-11 13:23:37 -05:00
David Baumgold
4152f5e4e8 Address pylint issue from diff-cover 2014-12-11 13:09:23 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Nimisha Asthagiri
aa309a8caf MA-182 Fix Mobile Subtitles. 2014-12-11 08:54:03 -05:00
John Jarvis
93f0c75fd3 Adding yaml_config, a new settings module
This reads configuration directly from yaml
and imports it directly into settings
2014-12-10 16:46:12 -05:00
cahrens
07b036f380 Return the filename as returned from default storage's save.
It might be different from the requested filename.
2014-12-10 15:23:56 -05:00
Andy Armstrong
0836a89636 Merge pull request #6189 from edx/andya/fix-masquerade
Fix Mako templates to always use updated request context
2014-12-10 11:39:29 -05:00
Jesse Zoldak
77bbd30396 Do not create a modulestore unnecessarily in tests 2014-12-10 11:18:12 -05:00
Christina Roberts
77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload
Upload CSV file for cohorting students
2014-12-10 11:04:14 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
Syed Hassan Raza
1a7c017e15 Fix white spaces inside navigation 2014-12-10 16:00:50 +05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
2014-12-09 23:38:31 -05:00
Sarina Canelake
db09c5529f Replace 'mit_dome.jpg' and 'simple_graph.png' with a default placeholder image 2014-12-09 22:28:09 -05:00
Sarina Canelake
7779f742c9 Rename pl-faculty.png to placeholder-faculty.png
OPEN-328
2014-12-09 22:28:09 -05:00