Commit Graph

6596 Commits

Author SHA1 Message Date
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
Tom Giannattasio
f7e20801cd added toast style error message styling 2012-09-07 11:44:17 -04:00
Tom Giannattasio
deaa49b15a fixed dogear issue 2012-09-07 11:44:17 -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
Kyle Fiedler
81ad9530d6 Some edits for the resources box 2012-09-07 09:49:43 -04:00
Kyle Fiedler
bd199ef5c3 Added opencourseware box on course about page 2012-09-07 09:49:43 -04:00
David Ormsbee
b276d8b4b1 Changes as per cpennington's code review 2012-09-07 09:47:13 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
David Ormsbee
e4c261ba37 Merge pull request #637 from MITx/kimth/cktsim-in-schematic
cktsim-in-schematic
2012-09-07 06:30:45 -07: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
Victor Shnayder
1e94ff19f3 remove debuging log message 2012-09-07 08:20:59 -04:00
Arjun Singh
e1c3696b3f Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-07 02:06:18 -10:00
Ibrahim Awwal
0cb2517207 Pagination urls now work for deep linking, although the discussion isn't automatically shown yet. 2012-09-07 04:16:39 -07:00
Ibrahim Awwal
b2f3eee93b Pagination in inline discussion views. 2012-09-07 03:37:19 -07:00
Arjun Singh
4b74354973 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 22:43:17 -10:00
Ibrahim Awwal
c3e3fee963 Convert expand/collapse into buttons and change default sort order to date. Buttons should be styled better but I don't know how to do it. 2012-09-06 23:37:43 -07:00
Arjun Singh
36b3524552 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 18:22:15 -10:00
Ibrahim Awwal
a40c8fad2d Fix inline thread rendering when expanding and contracting. 2012-09-06 19:04:56 -07:00
Ibrahim Awwal
b33ef47d20 Clear body textarea after a successful post. 2012-09-06 18:35:03 -07:00
Ibrahim Awwal
c4c956dbbb Fix accidental code formatting of abbreviated posts and put administrative buttons in the expanded content. 2012-09-06 18:09:09 -07:00
Ibrahim Awwal
0022efb7e4 Add loading animation to discussion module. 2012-09-06 18:08:28 -07:00
Matthew Mongeau
366e9c674b Code for displaying endorsed checkmark. 2012-09-06 17:46:04 -04:00
Tom Giannattasio
1d06a0feda fixed 1px drop menu glitch 2012-09-06 17:41:47 -04:00
Victor Shnayder
6017aa698b add ENABLE_DISCUSSION_SERVICE: "False" to cms config 2012-09-06 17:28:12 -04:00
Tom Giannattasio
9923323fdc styled new post error messages 2012-09-06 17:22:00 -04:00
Victor Shnayder
8b7390c966 Turn of discussion service in test env
- add a check for the feature flag before trying to save user info to the service
2012-09-06 17:11:21 -04:00
Victor Shnayder
048dea0eff make test course loading deterministic by using course_id 2012-09-06 16:38:33 -04: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
Victor Shnayder
02ddeed72a better error handling in index view 2012-09-06 16:24:59 -04:00
David Ormsbee
877a30eefa Merge pull request #639 from MITx/rocha/master
Added protored exam press release page
2012-09-06 13:09:54 -07:00
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -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
Calen Pennington
c49bcf5709 Merge pull request #638 from MITx/feature/cale/progress-handle-extra-credit
Feature/cale/progress handle extra credit
2012-09-06 12:54:52 -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
Calen Pennington
8030fdce80 Fix test and assertion reversal in progress test 2012-09-06 15:47:45 -04:00
Calen Pennington
5f261ec335 Test that values are clamped between 0 and 100% for progresses 2012-09-06 15:47:12 -04:00
kimth
f4f2efc30d Merge pull request #636 from MITx/feature/cale/progress-handle-extra-credit
Feature/cale/progress handle extra credit
2012-09-06 12:24:11 -07:00
Calen Pennington
5ce516a3a0 Clamp progress to be greater than zero 2012-09-06 15:23:19 -04:00
Calen Pennington
a1b3b6ba3c Merge pull request #635 from MITx/jarv/edX-template-updates
more template updates to rename MITx to edX
2012-09-06 12:19:41 -07:00
Calen Pennington
14eb160eea Just return a null progress if something goes wrong when retrieving capa_module progress (and log the error) 2012-09-06 15:18:59 -04:00
Calen Pennington
897a87646c Make progress handle extra credit by capping at 100%, and handle malformed progress stuff by ignoring any changes 2012-09-06 15:16:24 -04:00
kimth
032869744b cktsim-in-schematic 2012-09-06 15:12:52 -04:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
Tom Giannattasio
8529ef35a9 added title focus on new post; tweaked tag input styles 2012-09-06 14:57:37 -04:00
David Ormsbee
7eeedd4751 Merge pull request #634 from MITx/feature/victor/per-run-info
Feature/victor/per run info
2012-09-06 11:45:45 -07:00
Victor Shnayder
d4c0516c8b another attempt to see what's broken on jenkins 2012-09-06 14:41:09 -04:00