jarv
f18321cda2
Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration
...
Update course registration flow for non-modal registration and login
2013-05-06 10:31:29 -07:00
jarv
bf5ac6c263
Merge pull request #1950 from edx/jarv/drupal-new/iframe
...
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Greg Price
e5846e64bd
Modify course registration flow for new login and registration pages
...
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
John Jarvis
59c56c2610
fixing old about view, iframe updates
2013-05-02 15:05:12 -04:00
John Jarvis
01f8c4c816
Adding iframe view
...
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
2013-04-30 09:44:21 -04:00
Diana Huang
886e74342d
Move the testcenter login to external_auth
...
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
2013-04-25 11:12:19 -04:00
Calen Pennington
621a935577
Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3
...
Allow course staff to masquerade as students in viewing courseware
2013-04-24 04:17:34 -07:00
chrisndodge
0eed587571
Merge pull request #1839 from MITx/feature/sef/pressreleases
...
Press Releases: generic matching rule instead of explicit lines in url.py
2013-04-22 07:01:36 -07:00
ichuang
f1a899ac1c
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
2013-04-20 12:25:47 -04:00
ichuang
fac9d758d8
fix typo in masquerade url name
2013-04-13 22:47:43 -04:00
ichuang
3b4093ab7b
url and mitx_settings for masquerade
2013-04-13 22:47:04 -04:00
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
Carlos Andrés Rocha
93a59f244d
XBlock SDK announcement
...
LMS Lighthouse [#261 ]
2013-03-15 10:43:56 -07: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
