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 |
|
Brian Talbot
|
ecbe297936
|
studio - soft landing UI: how it works pathing, html and basic layout styling
|
2013-02-04 09:39:36 -05:00 |
|
Don Mitchell
|
85faab1dc6
|
Swallow event calls to squash 404 errors (and remove an unused var in
another function)
|
2013-01-30 15:18:51 -05:00 |
|
Chris Dodge
|
7f32aae47d
|
rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability
|
2013-01-30 11:50:11 -05:00 |
|
Chris Dodge
|
28a2dd9a18
|
support reordering of static tabs in studio
|
2013-01-28 16:33:28 -05:00 |
|
Chris Dodge
|
239b118abe
|
add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup.
|
2012-12-27 15:31:12 -05:00 |
|
Brian Talbot
|
ed3f3b02d6
|
studio - course export UI alpha - roughing in states/views
|
2012-12-26 09:10:05 -05:00 |
|
Don Mitchell
|
e0849e8b5a
|
Cache to debug other branch
|
2012-12-13 16:34:58 -05:00 |
|
Don Mitchell
|
0a91a98dd0
|
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
|
2012-12-11 10:55:10 -05:00 |
|
Don Mitchell
|
39024a7fee
|
Grading mostly working
|
2012-12-10 16:32:33 -05:00 |
|
Chris Dodge
|
130de49b49
|
support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed
|
2012-12-07 09:45:12 -05:00 |
|
Don Mitchell
|
111e8521db
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-30 10:40:19 -05:00 |
|
Don Mitchell
|
f0c94a2c7e
|
Beginning test of details tab.
|
2012-11-21 15:17:18 -05:00 |
|
Don Mitchell
|
7fecf1f212
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/static/sass/_settings.scss
cms/templates/settings.html
|
2012-11-19 16:20:12 -05:00 |
|
Don Mitchell
|
a9233dfd44
|
Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/views.py
|
2012-11-19 16:00:27 -05:00 |
|
Don Mitchell
|
91a91f4ddb
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-19 10:38:58 -05:00 |
|
Don Mitchell
|
fbc48026f2
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-16 12:51:31 -05:00 |
|