Usman Khalid
6cb62f2697
Rebase upgrade Django to v1.8.5
...
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Peter Fogg
7b801c66ca
Remove check for course home page improvements.
2015-11-09 14:43:53 -05:00
Chris Dodge
4216eaf5c3
change 'routing' for some reports which go to potentially backlogged queues
2015-11-06 08:29:17 -05:00
Nimisha Asthagiri
46523b1061
Transformer: ProctoredExamTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
0698076440
Transformer: StudentViewTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
ced7fde37f
Transformer: BlockNavigationTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
9abebe0599
Transformer: BlockDepthTransformer
2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
75a2355b74
Transformer: BlockCountsTransformer
2015-11-05 23:29:11 +00:00
Nimisha Asthagiri
ae4bc5d0c5
Transformer: BlocksAPITransformer
2015-11-05 22:30:44 +00:00
Nimisha Asthagiri
00e9237153
Course Blocks API
2015-11-05 22:30:44 +00:00
Nimisha Asthagiri
cbf90677b7
Merge pull request #10412 from edx/mobile/course-blocks-app
...
Course Blocks App MA-1556
2015-11-05 17:14:32 -05:00
Nimisha Asthagiri
a78b94d83a
Transformer: ContentLibraryTransformer
2015-11-05 16:22:06 -05:00
Nimisha Asthagiri
d1674ca85f
Transformer: SplitTestTransformer
2015-11-05 16:22:05 -05:00
Nimisha Asthagiri
a1c7c5f7e9
Transformer: UserPartitionTransformer
2015-11-05 16:22:05 -05:00
John Eskew
69e3385c83
Merge pull request #9920 from edx/jeskew/report_request_response_times
...
Add response times to get_many/set_many/delete_many.
2015-11-05 14:53:55 -05:00
Nimisha Asthagiri
dcdbd53e99
Transformer: StartDateTransformer
2015-11-05 14:41:42 -05:00
Nimisha Asthagiri
3f6baa992d
Transformer: VisibilityTransformer
2015-11-05 14:41:41 -05:00
Nimisha Asthagiri
a40d2b65d2
Course Blocks App MA-1556
2015-11-05 14:41:40 -05:00
Mark Sadecki
e5fd2888b8
Merge pull request #10514 from edx/cptvitamin/AC-222
...
adds an accessible label to the search input and the search button
2015-11-05 14:21:12 -05:00
Peter Fogg
4c934614d2
Merge pull request #10512 from edx/peter-fogg/date-summary-bugfix
...
Fix date summary blocks for courses without an end date.
2015-11-05 12:09:34 -05:00
Nimisha Asthagiri
7c480f93c6
Merge pull request #10245 from edx/jia/MA-1044
...
MA-1044 DiscussionTopic - Added bulk operations
2015-11-05 12:08:09 -05:00
David Baumgold
1aac73d614
Merge pull request #10493 from edx/db/kill-mitx-features
...
Remove legacy MITX_FEATURES reference
2015-11-05 11:56:35 -05:00
Matt Drayer
7256bd1b02
Merge pull request #10522 from edx/ziafazal/SOL-1377
...
SOL-1377: allow certifcate exception to be added for multiple courses
2015-11-05 11:35:17 -05:00
tasawernawaz
e978bcca96
Merge pull request #10502 from edx/tasawer/bugfix/ecom-2516-add-checkout-error-page
...
Added checkout error page.
2015-11-05 21:22:52 +05:00
John Eskew
ac05012d23
Add response times to get_many/set_many/delete_many.
2015-11-05 11:02:49 -05:00
Zia Fazal
941664294e
allow exception to be added for multiple courses
...
added unit test to test certs exception same user different courses scenario
2015-11-05 20:53:18 +05:00
Peter Fogg
445386233e
Fix date summary blocks for courses without an end date.
...
I also took this opportunity to do some small cleanups of the date
summary code, specifically converting some attributes to properties in
order to remove a Pylint directive disabling warnings about missing
docstrings.
2015-11-05 09:11:10 -05:00
wajeeha-khalid
509b2a4453
MA-1044 DiscussionTopic - Added bulk operations
2015-11-05 18:24:20 +05:00
chrisndodge
6daa5a631f
Merge pull request #10489 from edx/cdodge/button-style-fixes
...
(WIP) Proctoring: fix sass and use updated edx-proctoring version
2015-11-05 07:19:40 -05:00
Tasawer
06a91979e1
Added checkout error page.
...
ECOM-2516
2015-11-05 07:26:13 +00:00
Mark Sadecki
16b70a45b8
adds an accessible label to the search input and the search button
2015-11-04 18:09:55 -05:00
Matt Drayer
7a7cd6e660
Merge pull request #10459 from edx/ziafazal/SOL-1346
...
SOL-1346:convert string to bytestring before passing it to urllib.quote_plus
2015-11-04 17:07:46 -05:00
Mark Sadecki
aa1281456f
Merge pull request #10347 from edx/cptvitamin/TNL-3675
...
Fixes invalid/improper microdata and attribute values in the header logo
2015-11-04 16:18:19 -05:00
Robert Raposa
b76981234d
Merge pull request #10484 from edx/robrap/TNL-2646
...
TNL-2646: Escape json in Studio
2015-11-04 14:28:25 -05:00
Peter Fogg
acf5bb57cb
Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes
...
Course pacing template changes.
2015-11-04 14:11:49 -05:00
Robert Raposa
3682fac832
Add json escaping to Studio
...
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates
TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Eric Fischer
24ee5a68f5
Merge pull request #10490 from edx/release
...
Release 4 November 2015 to master
2015-11-04 13:19:09 -05:00
Peter Pinch
01f1c3a160
Merge pull request #10478 from mitocw/enhancement/aq/disable_auto_enrol_ccx
...
Disabled auto enroll in ccx coach's enrollment tab
2015-11-04 11:28:01 -05:00
Peter Fogg
5bd6e829e7
Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure
...
Fix `withData` and `withConfiguration` helpers.
2015-11-04 10:21:30 -05:00
Peter Fogg
b98c89117c
Course pacing template changes.
...
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.
ECOM-2794
ECOM-2800
2015-11-04 09:59:58 -05:00
Renzo Lucioni
2f0e663581
Use ugettext_noop instead of lambdas assigned to the underscore
...
Replaces instances of an old hack with the more clear ugettext_noop.
2015-11-04 09:17:18 -05:00
Amir Qayyum Khan
1f60e9696f
Disabled auto enroll in ccx enrollment tab
2015-11-04 11:56:01 +05:00
Zia Fazal
fbc8a13410
convert string to bytestring before passing it to urllib.quote_plus
...
further improvement in handling of unicode data
2015-11-04 11:22:36 +05:00
Eric Fischer
dc469ea5ec
Fix cert_status None. Add GeneratedCertificate to admin
2015-11-03 21:54:48 -05:00
David Baumgold
792c3d93c1
Remove legacy MITX_FEATURES reference
2015-11-03 15:37:41 -05:00
Mark Sadecki
3be86ca891
Fixes invalid/improper microdata and attribute values in the header logo
2015-11-03 15:20:48 -05:00
Chris Dodge
cfbb24837e
fix sass and use updated edx-proctoring version
2015-11-03 13:21:37 -05:00
Sarina Canelake
1172a49580
Merge pull request #10445 from stvstnfrd/chat
...
Remove chat feature
2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7
Merge pull request #10363 from edx/saleem-latif/SOL-1315
...
SOL-1315: Add Cert Exception UI on Instructor Dash
2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8
Add Cert Exception UI on Instructor Dash
2015-11-03 12:52:22 +05:00
