Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

348 Commits

Author SHA1 Message Date
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Don Mitchell
70f77ce4bf Add pagination to asset retrieval 
and push sorting down to the query
 2013-10-10 17:26:23 -04:00
cahrens
70cb24a37f Delete unused static-pages.html. 2013-10-09 15:06:58 -04:00
Julian Arni
a108827564 Route ajax request to appropriate view, and show feedback only then 
Hook up view

Fix getStatus function
 2013-10-07 09:51:19 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Jay Zoldak
e78edf8ef9 Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also. 2013-08-08 12:08:25 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
David Baumgold
64ad5567f3 Create urls/views/templates for dev-only views 
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
 2013-07-31 17:20:26 -04:00
David Baumgold
21a32370df Reorganize URLs and views around course team 
Match other views better, saner URLs, more RESTful style, extensible for other roles
 2013-07-29 13:11:48 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
ihoover
c6c3e4b9d3 working under cms too 2013-07-23 16:23:54 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
cahrens
9b2c384666 Add post callback to request course creator status. 2013-07-11 13:53:56 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
David Baumgold
77ae9a6a78 PDF Textbooks: fetch/save individual textbooks 
Created a few RESTful API endpoints, which required creating and assigning
arbitrary IDs to PDF textbooks. Changed the Backbone views to save individual
models, instead of saving a whole collection.
 2013-07-09 19:16:07 -04:00
David Baumgold
3d61c6294c Stubbed out textbooks index page 2013-07-09 19:15:58 -04:00
David Baumgold
1d7e15fc2e Remove duplicate URL route 2013-07-09 19:15:58 -04:00
cahrens
99584aab23 pep8 cleanup 2013-07-09 11:08:27 -04:00
cahrens
293ee0b0ae Update comment. 2013-07-08 12:09:53 -04:00
cahrens
2970f24245 Initial admin table view. 2013-07-03 09:24:02 -04:00
Ned Batchelder
645d847bb1 Remove unused imports from cms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
Chris Dodge
9b749c4201 add ajax callback entry point to remove the asset 2013-06-17 11:09:52 -04:00
David Baumgold
8e384a73be Remove proof-of-concept page 2013-05-22 15:55:51 -04:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Steve Strassmann
e76419093d uncommit unneeded files 2013-04-17 12:25:23 -04:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
Brian Talbot
a6c35fb2ce studio - addressing pull request to merge to master feedback 2013-04-08 09:30:09 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
862a7d13e9 pep8: line length 2013-03-22 16:17:37 -04:00
Brian Talbot
7051a94e7b resolved local master merge conflicts with studio sass 2013-03-21 16:15:19 -04:00
cahrens
8ca6e324af Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/sass/base-style.scss
	cms/urls.py
 2013-03-21 12:23:13 -04:00
Don Mitchell
9413364e55 Disambiguate the course_info url names. 2013-03-20 18:00:25 -04:00