Matthew Mongeau
0750ee0531
Registrations and signup form
2012-06-28 15:38:36 -04:00
Bridger Maxwell
2a9a15ad66
Beginning to port wiki to multicourse. (Unstable)
2012-06-28 15:11:00 -04:00
ichuang
8a6dd2f756
add 6.00x to dev_ike.py
2012-06-28 14:20:22 -04:00
Bridger Maxwell
cbe5c612b4
Used dictionary update for cleaner course settings code.
2012-06-28 14:04:50 -04:00
Bridger Maxwell
ef3afda283
Slash at the end of courses/ is now optionally there.
2012-06-28 14:01:19 -04:00
Bridger Maxwell
3386031fea
Moved more pieces of the about page to live in the course data directory.
2012-06-28 12:58:04 -04:00
John Jarvis
db614b2c16
removing symlinks
2012-06-28 12:51:50 -04:00
Bridger Maxwell
201f093981
Removed old import.
2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340
Removed old global course settings file.
2012-06-28 12:31:29 -04:00
Bridger Maxwell
51d6b3f096
Changed course settings to be a json file. Moved it to its own file.
2012-06-28 12:04:03 -04:00
Bridger Maxwell
fc1eeb08e3
Still working on making sections of the course about page dynamic.
2012-06-28 11:24:39 -04:00
John Jarvis
5c398b25da
updating edx4edx_aws config
2012-06-28 11:15:03 -04:00
ichuang
5688e89fab
change MITx -> edX in many lms templates
2012-06-28 10:26:59 -04:00
Calen Pennington
fedf2c8d00
Merge pull request #150 from MITx/stable-edx4edx-aws
...
Stable edx4edx aws
2012-06-28 05:39:42 -07:00
Calen Pennington
2fde7f4c6d
Minor fixes from pull request 131
2012-06-28 08:39:12 -04:00
ichuang
6f5e54b9de
Merge pull request #147 from MITx/ps-fix-problem
...
Queue up MathML conversion to be after render
2012-06-27 16:21:17 -07:00
ichuang
3f60c76fad
Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx
2012-06-27 19:14:32 -04:00
Bridger Maxwell
dfc2a35442
First pass at putting dyanamic content from data on course about page.
2012-06-27 18:31:39 -04:00
John Jarvis
03b6bd044e
setting quickedit to true
2012-06-27 18:06:29 -04:00
Galen Frechette
38425e9b9c
adds styles back to courseware
2012-06-27 15:55:22 -04:00
Bridger Maxwell
bf4f946f0d
Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue.
2012-06-27 14:47:16 -04:00
Matthew Mongeau
56d5e54150
Hook up about and jobs pages. Use named route for root.
2012-06-27 13:52:49 -04:00
Galen Frechette
4715c69c36
redesigns course item on home page and find courses page, refactors its implimentation and makes vrious other design improvements
2012-06-26 23:26:12 -04:00
ichuang
c5630e6d9f
MITx -> edX in activation email
2012-06-26 23:09:52 -04:00
ichuang
c0581f8c86
fix subject in activation email - now uses course_title
2012-06-26 23:07:24 -04:00
ichuang
200e188c09
add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation
...
- issue is that content machine isn't whitelisted for email
- this also provides secondary filtering for user registration
2012-06-26 23:00:25 -04:00
pmitros
fee4ecf742
Merge pull request #149 from MITx/stable-edx4edx-aws
...
Stable edx4edx aws
We may need to switch quickedit, based on feedback from Ike.
2012-06-26 16:52:46 -07:00
John Jarvis
7b86caafad
adding edx4edx_aws for edx4edx aws instance
2012-06-26 19:34:53 -04:00
ichuang
a3b38f2f3f
Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx
2012-06-26 23:08:24 +00:00
ichuang
bda75b4fbd
add admin model for student (need to be able to see activation keys in db)
2012-06-26 23:07:45 +00:00
ichuang
5d9c600de8
3.091x static link
2012-06-26 19:04:51 -04:00
ichuang
a1b53c3cd6
add 3.091x to multicourse
2012-06-26 18:40:07 -04:00
Matthew Mongeau
a681eed8a4
Fix additional urls.
2012-06-26 17:46:37 -04:00
Matthew Mongeau
b8d50e51ee
Course navigation work
2012-06-26 17:23:16 -04:00
Prem Sichanugrist
4db0a70166
Fix code convention
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
4580ef89d4
Queue up MathML conversion to be after render
...
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4
Fix test failure after progress introduction
2012-06-26 16:35:44 -04:00
Kyle Fiedler
6c95bfc175
Fix hover on textbook buttons
2012-06-26 15:18:17 -04:00
Kyle Fiedler
fc81cf75c1
fixed padding issue on seq nav
2012-06-26 14:56:28 -04:00
David Ormsbee
084c4875be
Merge pull request #144 from MITx/kf-seq-nav
...
Added new styles for the sequence nav including completeness
2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7
Merge pull request #145 from MITx/kf-sidebar-buttons
...
Added fix for the sidebar buttons in the courseware
2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a
Added fix for the sidebar buttons in the courseware
2012-06-26 14:31:04 -04:00
Kyle Fiedler
aee2cf4ed5
Added new styles for the sequence nav including completeness
2012-06-26 14:09:57 -04:00
Prem Sichanugrist
3f9554f20b
Merge pull request #141 from MITx/ps-player-slider
...
Scroll the caption upon video seeking
2012-06-26 07:32:06 -07:00
ichuang
9aeaaa72a9
configuration running on content server: lms/envs/dev_edx4edx
2012-06-26 14:07:14 +00:00
ichuang
caa14922bb
edx4edx configuration running on content server. Notes:
...
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
- email backend set
- index page modified for edx4edx
2012-06-26 14:04:56 +00:00
ichuang
a988452d4d
Merge pull request #132 from MITx/kf-problems
...
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes. The table borders can be fixed in another round.
2012-06-25 19:14:12 -07:00
Galen Frechette
a63a93873f
various ui tweeks
2012-06-25 17:47:36 -04:00
Galen Frechette
915810d457
cleans up alignment of login and signup modals
2012-06-25 14:18:01 -04:00
Galen Frechette
1d7b30159b
adds signup modal
2012-06-25 13:53:10 -04:00
