Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,160 Commits 1 Branch 0 Tags
8fcf574029786fc3d4e84dc50af05262bbab5eb9
Commit Graph

6450 Commits

Author SHA1 Message Date
frances botsford
e9a323405b Merge pull request #10609 from edx/frances/adjust-studio-cert-limits 
Add certificates signatory limit help text in Studio
 2015-12-04 13:14:28 -05:00
Jillian Vogel
b7f0836be8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	AUTHORS
 2015-12-04 11:26:55 +10:30
Peter Fogg
068b439ada Merge pull request #10821 from edx/peter-fogg/fix-certs-tests 
Fix broken certificates-related tests.
 2015-12-03 18:00:16 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -05:00
Peter Fogg
1ba1c213d5 Fix broken certificates-related tests. 2015-12-03 16:30:05 -05:00
Jillian Vogel
6fd5ba5a69 MA-240 Added window beforeunload handler to the ActiveVideoUploadList view, 
which shows a notification if there are any "Queued" or "Uploading" videos still in progress.
 2015-12-04 07:38:22 +10:30
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs 
Remove default honor code.
 2015-12-03 14:55:30 -05:00
Dan Powell
31646e4a72 Don't render unconfigured marketing links in CMS footer. 2015-12-03 13:41:53 -05:00
Renzo Lucioni
1cee9a0dcd Merge pull request #10714 from edx/renzo/programs-authoring-page 
Add a Studio view and template to host the Programs authoring app
 2015-12-03 12:12:23 -05:00
Renzo Lucioni
e2833d8fc6 Add a Studio view and template to host the Programs authoring app 
The Programs authoring app is a Backbone SPA maintained in a separate repository. The app handles its own routing and provides a UI which can be used to create and publish new Programs (e.g, XSeries). ECOM-2598.
 2015-12-03 10:47:12 -05:00
Adam Palay
72e7ac5d4c do orphan deletion in a bulk operation (SUST-21) 2015-12-02 13:33:59 -05:00
Frances Botsford
287304c714 visual cleanup to view and edit certificates page in studio 2015-12-01 16:36:18 -05:00
Douglas Hall
63bee2a8ad Merge pull request #10600 from edx/task/douglashall/PHX-201/xblock_lti_consumer 
Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements
 2015-11-30 16:18:14 -05:00
Douglas Hall
74c19c2854 Adding LTI consumer XBlock to requirements; Updating xblock-utils requirement 2015-11-30 11:58:51 -05:00
Zia Fazal
46150800c0 Merge pull request #10737 from edx/ziafazal/SOL-1433 
SOL-1433:remove audit course mode
 2015-11-26 13:46:33 +05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Zia Fazal
aa529fe0b6 remove audit course mode 
removed print statement
 2015-11-25 17:58:30 +05:00
Christine Lytwynec
0100e50669 Merge pull request #10666 from edx/clytwynec/ac-239 
remove unneeded aria-describedby and aria-hidden attrs on studio modal
 2015-11-24 12:14:44 -05:00
Christine Lytwynec
9a361b6b8a remove unneeded aria-describedby and aria-hidden attrs on studio modal 2015-11-24 10:42:04 -05:00
Ned Batchelder
e16fad3540 Add the Microsoft Office Mix XBlock 2015-11-24 09:04:12 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Kevin Falcone
24d72883b2 Merge pull request #10684 from edx/jibsheet/force_publish-arg-parsing 
Jibsheet/force publish arg parsing
 2015-11-20 11:00:31 -05:00
Usman Khalid
c22d0de9fb Merge pull request #10690 from edx/usman/fix-settings 
Cleanup some settings.
 2015-11-20 20:41:59 +05:00
Usman Khalid
dc7b57f459 Cleanup some settings. 2015-11-20 18:18:32 +05:00
Kevin Falcone
149df9b22f Django 1.8 disallows access to args[] 
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/
You need to declare and do proper argument parsing.  --commit is also
more natural than a bare 'commit' on the end of a command.

Switch from calling handle() directly to call_command().
call_command() simulates using the management command so is a better
test of the command line interface.
 2015-11-19 21:39:53 -05:00
Kevin Falcone
daf4db8647 Update --commit flag so you don't have to say --commit=commit 
With the 1.8 upgrade, we stopped using 'manage.py cms command commit'
and switched to --commit because we no longer directly access args[]
https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/

When this command was updated, it was switched to --commit=commit, but
using store_true allows a much more natural --commit syntax.
 2015-11-19 15:26:28 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
asadiqbal
88ae4ce257 SOL-1416 2015-11-18 11:56:49 +05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Ned Batchelder
ccc6e5077d Make sure Studio has a secret key 2015-11-13 12:30:54 -05:00
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
Matt Drayer
fab6e00313 Merge pull request #10417 from edx/ziafazal/SOL-1358 
ziafazal/SOL-1358: enabled web certs by default for all new courses
 2015-11-10 10:56:13 -05:00
Zia Fazal
cbc57aae6b enabled web certs by default 
changing default value instead of setting it via fields

fixed broken test

fixed quality violation

following another approach
 2015-11-10 18:51:14 +05:00
Syed Hasan raza
40847db72c Merge pull request #10153 from edx/shr/bug/PLAT-875-Courses_Appear_in_search_after_deletion 
Delete course entry from CourseAboutSearchIndex
 2015-11-10 14:30:57 +05:00
Syed Hassan Raza
3102788bd1 Delete course entry from CourseAboutSearchIndex 2015-11-07 18:27:09 +05:00
Andy Armstrong
a3ff4d50e8 Merge pull request #10534 from edx/andya/fix-studio-videos 
Fix optimizing of draggabilly and json2
 2015-11-06 12:12:44 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
asadiqbal
13508c7681 SOL-1379 2015-11-06 18:45:36 +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
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly 
Upgrade draggabilly.js to fix Firefox iframe bug
 2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug 
TNL-3627
 2015-11-05 10:10:39 -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
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
Robert Raposa
0964bf280f Remove unused method subsection_handler 
Removing this particular call to json.dumps was done by removing
the complete method subsection_handler which is no longer
used.  The template edit_subsection.html had already been removed.

TNL-2646 Escape json
 2015-11-04 13:34:42 -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