Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,395 Commits 1 Branch 0 Tags
2380e7fff46be16d9d952ddf034c520e72b2bed9
Commit Graph

75 Commits

Author SHA1 Message Date
Tom Giannattasio
b5df53f9d5 fixed merge conflict 2012-09-04 13:01:08 -04:00
Tom Giannattasio
5c66924fd5 fixed drop filter 2012-09-04 12:59:45 -04:00
Arjun Singh
91379aa9a6 improve date search, fix respnding, make sidebar expand when discussion column does 2012-09-04 03:53:37 -07:00
Arjun Singh
9064f81bc6 minor sidebar fix 2012-09-04 02:33:42 -07:00
Arjun Singh
890c5e50e1 fix up sidebar jitter 2012-09-04 02:29:28 -07:00
Rocky Duan
644fb9c13c commented out unnecessary code 2012-09-02 14:07:35 -07:00
Ibrahim Awwal
4ce4c0c444 Fix the dropdown filtering so it actually ignores the unread messages count. 2012-08-31 17:15:31 -07:00
Tom Giannattasio
b167e0f70a added filter drop; tweaked sidebar coordinate settings to accommodate new post 2012-08-31 15:20:53 -04:00
Matthew Mongeau
dc9f49b6d2 Show dropdown on click. 2012-08-30 19:43:38 -04:00
Tom Giannattasio
a728134129 merge conflict fixes 2012-08-30 16:52:34 -04:00
Tom Giannattasio
da413f6de8 added sticky sidebar 2012-08-30 16:37:22 -04:00
Matthew Mongeau
6ee27d02e4 Searching and fixes. 2012-08-30 15:55:46 -04:00
Tom Giannattasio
757c817b95 tweaked comment styles 2012-08-30 13:37:50 -04:00
Tom Giannattasio
1559b86e27 added new post markup, style and basic interactions 2012-08-30 11:37:50 -04:00
Tom Giannattasio
5db29b87ee tweaked sidebar styles; added temp javascript functionality for sidebar 2012-08-29 16:22:14 -04:00
Tom Giannattasio
2783ff7e63 added simple table filtering to gradebook 2012-08-23 16:57:03 -04:00
Tom Giannattasio
b494441e7a started new gradebook functionality 2012-08-23 16:40:48 -04:00
Tom Giannattasio
5950520e71 tweaked sequence nav and discussion profile sidebar 2012-08-23 11:11:22 -04:00
Tom Giannattasio
e762844c35 new sequence nav functionality - accommodates an infinite number of items 2012-08-21 18:12:59 -04:00
Rocky Duan
348a7b6eb7 render time ago in front end 2012-08-20 12:04:25 -07:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:48:06 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:44:25 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
79497287d7 moved some stuff & ajax link to page 2012-08-03 15:55:21 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Kyle Fiedler
c611bd9228 added treeview 2012-07-30 17:39:44 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
Bridger Maxwell
1e1e777e04 Fixed bugs caused by modal cloning. Now, only video modals are cloned. 2012-07-23 19:19:27 -04:00
Matthew Mongeau
6962735b19 Clone and remove modal 2012-07-23 16:35:19 -04:00
Matthew Mongeau
315063ffed Add rel=0 to all lightbox videos. 2012-07-23 12:09:09 -04:00
Bridger Maxwell
61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. 2012-07-22 14:52:49 -04:00
Matthew Mongeau
0cfd915161 Link faq to be able to sign up from corresponding question. 2012-07-19 16:41:24 -04:00
Matthew Mongeau
7d3c778268 Force dataType to 'text json' 2012-07-18 11:36:20 -04:00
Matthew Mongeau
9bf4b11ae9 Style notice. 2012-07-18 10:11:06 -04:00
Matthew Mongeau
c5d3efdf60 Show sign up form if not signed in. 2012-07-18 10:10:37 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00