Brian Wilson
2d9deaf38c
remove code for supporting anchor_id on html textbooks, since it doesn't work
2013-04-12 11:53:06 -04:00
Sef Kloninger
bd2330a8f0
press releases: more explicitly match on slug (safety)
2013-04-10 08:20:30 -04:00
Sef Kloninger
4b68e0282f
press releases: use generic matching rule
...
This way instead of having to explicitly add releases to the urls.py
file, we just add the relase to the static_templates/press_releases
directory and the right thing happens.
Getting rid of the current "feature" where /pressrelease redirects to
the current press release. It was broken, looks like it's unused.
Limitation: release file name must match slug, but with underscores and
all lower case.
Why bother? I wanted to do something small to learn the edX toolchain.
2013-04-10 02:16:35 -04:00
Brian Talbot
78079d1ca7
Merge branch 'master' into drupal-new
2013-04-08 22:35:29 -04:00
Victor Shnayder
9f9748b9fa
Stanford press release
2013-04-03 14:26:06 -04:00
Carlos Andrés Rocha
a15baa97c5
Add UTAustinX landing page
2013-03-28 13:23:58 -04:00
John Jarvis
78987cc400
resolving merge conflicts
2013-03-19 16:16:32 -04:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
Carlos Andrés Rocha
93a59f244d
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-15 10:43:56 -07:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
David Ormsbee
0605c94113
Merge pull request #1636 from MITx/feature/brian/htmlbook
...
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Brian Wilson
bed7dbdb6b
fix plumbing for anchors and chapters.
2013-03-08 18:25:33 -05:00
Calen Pennington
cd802d8e14
Add datadog metrics capture around heartbeat timing
2013-03-08 10:36:59 -05:00
Brian Wilson
b5ab766092
initial framework for htmlbook
2013-03-06 17:57:33 -05:00
Diana Huang
1aa3580dcb
Switch over to using the inputtype ajax handler for chemical input.
2013-03-06 14:41:48 -05:00
David Ormsbee
b0afbba58d
Merge pull request #1516 from MITx/hack/dave/submission_history
...
Record and report submission history for a problem
2013-03-04 11:39:54 -08:00
Brian Wilson
fa00ea442e
add first pass at multi-chapter support.
2013-02-25 01:26:34 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Victor Shnayder
84eaec3666
add press release: edX expands internationally
2013-02-20 17:50:23 -05:00
Victor Shnayder
1ae06a45bb
Add lower case urls for universities.
...
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
because the proper urls are prettier
2013-02-20 14:59:28 -05:00
Victor Shnayder
2981f532c1
Integrate Brian T's front-page changes, add epfl and delft
...
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
2013-02-19 22:04:20 -05:00
John Jarvis
fd36c555a6
Renaming login url for modal-less login
2013-02-19 19:36:32 -05:00
John Jarvis
4596fa417f
Changing login and signin view names
2013-02-19 17:31:22 -05:00
John Jarvis
dabcb51746
resolving merge conflicts
2013-02-19 12:43:06 -05:00
Victor Shnayder
c37238d592
Initial landing pages for ANU, McGill, Rice, Toronto
2013-02-19 08:22:09 -05:00
David Ormsbee
8f17e6ae9e
First pass at implementing problem history.
2013-02-15 01:30:14 -05:00
Brian Wilson
0d3b566dd8
finish piping URL through to pdf.js
2013-02-14 15:47:53 -05:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Brian Wilson
f0258b8dd0
first pass at pdfbook
2013-02-13 18:01:44 -05:00
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
14676d1c32
Untrack dev.py, add in redirect code for peer grading
2013-02-04 14:05:02 -05:00
Vik Paruchuri
c6c89e4216
Make peer grading xmodule work with notifications
2013-02-04 13:16:05 -05:00
Vik Paruchuri
f742b7d865
Start to integrate peer grading xmodule back into notifications
2013-02-04 12:07:03 -05:00
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05:00
Vik Paruchuri
bdb82cda65
Strip out JS, old urls
2013-01-31 18:23:30 -05:00
Vik Paruchuri
01cdc6e7f8
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
...
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
2013-01-31 16:50:10 -05:00
Vik Paruchuri
8e9ec501a7
Implement flagging, fix urls
2013-01-30 21:44:21 -05:00
Vik Paruchuri
10c7155d4d
Add open ended to JS pipeline
2013-01-30 21:28:42 -05:00
Vik Paruchuri
17fce100bb
Add in ban actions to table
2013-01-30 21:10:48 -05:00
Vik Paruchuri
dd72297f73
Wire up flagged problem list
2013-01-30 20:39:53 -05:00
Victor Shnayder
0353cb98e1
7.00x press release
2013-01-30 16:07:47 -05:00
Vik Paruchuri
0f212cc8f2
Fix course id passing, template rendering
2013-01-29 19:31:02 -05:00
Vik Paruchuri
2191f3e228
Add in open ended problems view
2013-01-29 19:30:03 -05:00
Victor Shnayder
19c46d224f
BostonX press release
2013-01-29 17:33:06 -05:00
Victor Shnayder
de02721158
Add removing students from cohorts.
2013-01-24 15:14:33 -05:00
Victor Shnayder
bab3b0c39e
Add initial set of views for managing cohorts
...
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
2013-01-24 15:12:53 -05:00
John Jarvis
4af2e1118a
Changing login and register to login_user and register_user
2013-01-23 18:44:26 -05:00
