Rocky Duan
|
048deaa87f
|
show news & options when submit comment
|
2012-07-25 18:16:57 -04:00 |
|
Rocky Duan
|
aab9f8dc1c
|
make course id available in xmodule
|
2012-07-25 18:15:52 -04:00 |
|
Rocky Duan
|
4b8c3b9b12
|
watch/unwatch threads; display current vote
|
2012-07-25 18:15:52 -04:00 |
|
Rocky Duan
|
5e5dda2dfb
|
refactored out thread rendering; vote
|
2012-07-25 18:15:51 -04:00 |
|
Rocky Duan
|
d49338c948
|
integrated search; refactored some frontend code
|
2012-07-25 18:15:51 -04:00 |
|
Rocky Duan
|
3267aa1737
|
forum view for discussions
|
2012-07-25 18:14:58 -04:00 |
|
Rocky Duan
|
846a488ef2
|
create new post
|
2012-07-25 18:11:00 -04:00 |
|
Rocky Duan
|
d393481b21
|
some basic functionalities of discussion
|
2012-07-25 18:11:00 -04:00 |
|
Rocky Duan
|
9abc888340
|
display simple threaded comment
|
2012-07-25 18:09:34 -04:00 |
|
Arjun Singh
|
cdea9488ef
|
Fixing up bracket indentation
|
2012-07-25 15:58:14 -04:00 |
|
Kyle Fiedler
|
bb3dfc5c08
|
fix courseware css file so it imports the right files in the right order
|
2012-07-25 15:54:18 -04:00 |
|
Rocky Duan
|
54ea3dba22
|
show news & options when submit comment
|
2012-07-25 15:30:05 -04:00 |
|
Kyle Fiedler
|
00596d2f20
|
Added courseware css back into the main template
|
2012-07-25 14:57:44 -04:00 |
|
Brittany Cheng
|
388ddc5365
|
change activation complete green and add styles for faq
|
2012-07-25 14:57:00 -04:00 |
|
Rocky Duan
|
bedeac3a55
|
make course id available in xmodule
|
2012-07-24 18:51:56 -04:00 |
|
Calen Pennington
|
bdf964a305
|
Modularize video css
|
2012-07-24 16:14:05 -04:00 |
|
Calen Pennington
|
6029c28695
|
Modularize sequence css
|
2012-07-24 16:14:04 -04:00 |
|
Calen Pennington
|
8a0270ea2b
|
Allow for modular css from XModules, and split capa module css out as a test
|
2012-07-24 16:14:04 -04:00 |
|
Calen Pennington
|
7e4d3c8b35
|
Modularize sequence coffeescript in prepration for CMS preview
|
2012-07-24 16:14:02 -04:00 |
|
Rocky Duan
|
a06cc229a0
|
watch/unwatch threads; display current vote
|
2012-07-24 15:34:17 -04:00 |
|
Calen Pennington
|
d8f8d8c656
|
Merge branch 'release/1.0'
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
|
2012-07-24 08:52:50 -04:00 |
|
Kyle Fiedler
|
3008c17730
|
Added bottom margin for articles in help
|
2012-07-23 19:19:50 -04:00 |
|
Kyle Fiedler
|
18ec7ca8e8
|
Added social links to the footer of the press release
|
2012-07-23 19:17:22 -04:00 |
|
Rocky Duan
|
d6be47d942
|
refactored out thread rendering; vote
|
2012-07-23 19:03:36 -04:00 |
|
Kyle Fiedler
|
6aac776a33
|
Added styles for help page
|
2012-07-23 18:40:58 -04:00 |
|
Kyle Fiedler
|
2cb9e2997e
|
Move the shiv back to the header
|
2012-07-23 18:22:21 -04:00 |
|
Kyle Fiedler
|
63faa76e2a
|
More small ie fixes
|
2012-07-23 17:49:48 -04:00 |
|
Kyle Fiedler
|
0f4976e069
|
Added some small IE fixes
|
2012-07-23 16:53:39 -04:00 |
|
David Ormsbee
|
64ecd3a211
|
Merge pull request #275 from MITx/uc_berkeley_press
Added contact info on Berkeley press release.
|
2012-07-23 12:52:16 -07:00 |
|
Rocky Duan
|
616eaf2500
|
integrated search; refactored some frontend code
|
2012-07-23 15:41:09 -04:00 |
|
Bridger Maxwell
|
e1ad3539b6
|
Updated contact information on press release.
|
2012-07-23 15:40:10 -04:00 |
|
Kyle Fiedler
|
b4d08f820e
|
Chage placement of the read more link
|
2012-07-23 15:28:24 -04:00 |
|
Bridger Maxwell
|
f6b4475309
|
Added contact info on Berkeley press release.
|
2012-07-23 15:22:06 -04:00 |
|
Kyle Fiedler
|
c2b426afeb
|
prereqs float right
|
2012-07-23 15:14:04 -04:00 |
|
David Ormsbee
|
40aaaeda25
|
Merge pull request #254 from MITx/uc_berkeley_press
UC berkeley press
|
2012-07-23 11:46:44 -07:00 |
|
Calen Pennington
|
7ef8b6ac1e
|
Merge remote-tracking branch 'origin/release/1.0'
|
2012-07-23 14:27:29 -04:00 |
|
Kyle Fiedler
|
54516a9560
|
Fix grid and make sure that everything is fluid
|
2012-07-23 13:56:44 -04:00 |
|
Kyle Fiedler
|
6da83900aa
|
Added min width for container
|
2012-07-23 13:56:44 -04:00 |
|
Kyle Fiedler
|
b557363ac2
|
Added som fixed for fluid design
|
2012-07-23 13:56:44 -04:00 |
|
Calen Pennington
|
ebe67d2d7d
|
Merge remote-tracking branch 'origin/release/1.0'
Conflicts:
common/djangoapps/student/views.py
|
2012-07-23 13:55:20 -04:00 |
|
Bridger Maxwell
|
863071c9a5
|
Merge remote-tracking branch 'origin/release/1.0' into uc_berkeley_press
Conflicts:
lms/urls.py
|
2012-07-23 13:44:04 -04:00 |
|
Kyle Fiedler
|
e6465e420a
|
Changed around the css
|
2012-07-23 12:38:21 -04:00 |
|
Kyle Fiedler
|
8eeeac716b
|
Added some design changes to the homepage header
|
2012-07-23 12:06:17 -04:00 |
|
Rocky Duan
|
784bd26510
|
forum view for discussions
|
2012-07-22 19:05:32 -04:00 |
|
David Ormsbee
|
074fc24343
|
Fix up the signup modal for registration for the new fields.
|
2012-07-22 18:53:12 -04:00 |
|
Bridger Maxwell
|
ed10dc43d9
|
Added UC Berkeley press release. Moved press releases to their own folder.
|
2012-07-22 17:35:10 -04:00 |
|
David Ormsbee
|
fa51046949
|
Merge pull request #253 from MITx/smooth_registration
Smooth registration
|
2012-07-22 13:49:59 -07:00 |
|
David Ormsbee
|
679b19c94d
|
Merge pull request #240 from MITx/unenroll
Unenroll
|
2012-07-22 12:23:02 -07:00 |
|
David Ormsbee
|
e21e5284de
|
Remove placeholder background image from courses and course about pages.
|
2012-07-21 20:27:04 -04:00 |
|
Bridger Maxwell
|
2f4aba8042
|
If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account.
|
2012-07-21 17:52:28 -04:00 |
|