Commit Graph

768 Commits

Author SHA1 Message Date
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
2012-09-07 14:18:34 -04:00
Kyle Fiedler
4d4e5824cd Change form style for login and signup modals so it is consistant in every browser and we have no usability problems 2012-09-07 13:29:49 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
Kyle Fiedler
012edbfd40 Fix main navigation and footer links also make text not italic 2012-09-07 11:14:26 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors
Feature/ibrahim/discussion distinguish instructors
2012-09-07 06:52:15 -07:00
David Ormsbee
b276d8b4b1 Changes as per cpennington's code review 2012-09-07 09:47:13 -04:00
David Ormsbee
5c2bab1ac5 Merge pull request #641 from MITx/hotfixes/rocha
Added proctored exams news to the frontpage
2012-09-07 06:28:04 -07:00
David Ormsbee
0b4ef7e5d9 Merge pull request #640 from MITx/feature/kfiedler/autofocus
Added outofocus for sign in and log in forms
2012-09-07 06:27:24 -07:00
Carlos Andrés Rocha
fc793b94fc Added proctored exams news to the frontpage 2012-09-06 16:33:10 -04:00
Kyle Fiedler
d923be0786 Added outofocus for sign in and log in forms 2012-09-06 16:29:51 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator
Put in calculator in courseware
2012-09-06 13:00:09 -07:00
David Ormsbee
1acb7dc24f Add a short delay to calculator input focus so it doesn't jump to the bottom of the screen when you open it. 2012-09-06 15:52:31 -04:00
ichuang
56951e9961 put try-catch around histogram coffeescript code 2012-09-06 11:18:00 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences
Feature/ibrahim/discussion sort preferences
2012-09-03 10:25:04 -07:00
kimth
ae022b662a Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded 2012-08-31 20:46:34 -04:00
Arjun Singh
26ca1f5f5b Merge master 2012-08-31 15:13:50 -07:00
Kyle Fiedler
e7a7c71324 Added icon to mark it as having a due date 2012-08-31 17:58:08 -04:00
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
Arjun Singh
7108985325 Adding context to posts in the forum view. 2012-08-31 04:59:12 -07:00
Ibrahim Awwal
b80ceecf87 Note when posts have been updated, and put the creation date in the title text. 2012-08-30 00:19:42 -07:00
Ibrahim Awwal
cd84b63228 Make the search button line up with the search field better. 2012-08-29 22:13:38 -07:00
Ibrahim Awwal
e1aa30b36f Style comments from moderators in light blue, and admins in light green. Also puts text after the author's name (there should be something for colorblind people, not sure what form it should take though). 2012-08-29 21:52:22 -07:00
Arjun Singh
5d6bed863a Fix discussions in xmodules 2012-08-29 16:41:01 -07:00
Arjun Singh
1c176d369b add margin between checkbox and text 2012-08-29 03:25:08 -07:00
David Ormsbee
18127cf967 Merge pull request #569 from MITx/feature/rocha/wiki-cheatsheet
Refactored wiki cheatsheet code.
2012-08-28 07:59:05 -07:00
Carlos Andrés Rocha
8b0d1f09e0 Refactored wiki cheatsheet code. 2012-08-27 18:30:38 -04:00
Ibrahim Awwal
773a32e39f Fix bug with sorting discussion forums (event was not being passed into the event handler). 2012-08-27 13:00:02 -07:00
Kyle Fiedler
9d6bf9a8fd Added some fixes for the calculator 2012-08-27 10:15:31 -04:00
Matthew Mongeau
db492cc400 Add back in calculator related code. 2012-08-27 09:43:37 -04:00
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07:00
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -04:00
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
David Ormsbee
d0f2f31063 Merge pull request #547 from MITx/feature/rocky/discussion
fixed profiled user id (toggle moderator status)
2012-08-24 08:25:42 -07:00
Tom Giannattasio
10c953e8a4 Merge pull request #534 from MITx/feature/kfiedler/wiki
fix wiki falsh message
2012-08-24 08:03:37 -07:00
Arjun Singh
eb4068cc11 Make profile page look reasonable 2012-08-24 03:14:42 -07:00
Arjun Singh
eb65b95232 Removing stray return statement 2012-08-24 03:06:44 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
cc5fbdd5a7 fixed appearance of loading icon near sort bar 2012-08-24 02:05:11 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
88a3e828f6 don't use raw html when rendering 2012-08-24 01:04:11 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
David Ormsbee
575a91e2ef Merge pull request #539 from MITx/feature/rocky/blank_slate_fix
remove blank slate after new post
2012-08-23 15:08:25 -07:00