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
cahrens
6d6e144c35
Urls working.
2013-03-20 16:37:08 -04:00
Brian Talbot
99cf432390
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-20 10:45:01 -04:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
cahrens
f6fb64f130
Saving checkbox state, client template for individual checklist.
2013-03-18 15:03:54 -04:00
cahrens
564374048e
A little cleanup.
2013-03-14 09:35:26 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
1b5f040021
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
2013-03-12 21:57:40 -04:00
Brian Talbot
36746fb729
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-12 16:05:54 -04:00
Chris Dodge
3568db73e3
initial wiring of 404/500 error pages for Studio
2013-03-11 13:54:44 -04:00
Calen Pennington
cd802d8e14
Add datadog metrics capture around heartbeat timing
2013-03-08 10:36:59 -05:00
Brian Talbot
559a311acb
studio - alerts: refactored static alerts demo view to have a different template/view/url name to help with user facing views vs. documentation views
2013-03-07 11:37:15 -05:00
Brian Talbot
8552b2d614
local merge with master - WIP
2013-03-01 15:47:23 -05:00
Brian Talbot
d809df913d
studio - alerts: moved all states and documentation into new /alerts view
2013-02-25 14:45:27 -05:00
cahrens
6981ba4e3f
Get Save and Cancel working.
2013-02-19 17:08:10 -05:00
cahrens
167d07037d
Merged, delete Ace.
2013-02-19 14:56:37 -05:00
Don Mitchell
cfa13922f5
Change url for login from login to signin.
2013-02-15 17:30:24 -05:00
Don Mitchell
6f3a954d7b
howitworks is default home page if not logged in. Otherwise course
...
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
2013-02-13 09:30:54 -05:00
Don Mitchell
d569c559ca
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
2013-02-12 16:57:00 -05:00
Brian Talbot
8367f565dc
studio - settings: revised URLs for temporary consistency and added in help/explanation text 1st draft
2013-02-11 13:21:35 -05:00
Don Mitchell
9cd1162a60
Grading and details split out. Put the unimplemented tabs into a single
...
file not used.
2013-02-07 14:45:24 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
