Arjun Singh
9eecd43a4a
Fix jump to courseware test to expect a redirect
2012-08-31 17:49:15 -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
kimth
56cc237eef
Merge branch 'master' into kimth/mark-graded
2012-08-31 20:41:39 -04:00
Ibrahim Awwal
4ce4c0c444
Fix the dropdown filtering so it actually ignores the unread messages count.
2012-08-31 17:15:31 -07:00
Ibrahim Awwal
f6ee08271d
Ensure that js files are returned in alphabetical order by django-pipeline.
...
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
2012-08-31 15:25:07 -07:00
Ibrahim Awwal
e600004b1f
Make the comment client not explode if it doesn't get a sort preference from the comment service.
2012-08-31 15:19:17 -07:00
Arjun Singh
26ca1f5f5b
Merge master
2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1
Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO
2012-08-31 15:11:29 -07:00
kimth
8c0780bcdc
Adjust comments
2012-08-31 18:05:54 -04:00
kimth
e482a32d27
Accordion distinguishes items to be graded
2012-08-31 18:05:54 -04:00
Kyle Fiedler
e7a7c71324
Added icon to mark it as having a due date
2012-08-31 17:58:08 -04:00
kimth
648d54b027
Adjust comments
2012-08-31 17:05:48 -04:00
kimth
e8c4bc0c25
Accordion distinguishes items to be graded
2012-08-31 17:05:48 -04:00
Tom Giannattasio
d1238a277f
tweaked sidebar bugs
2012-08-31 16:58:13 -04:00
David Ormsbee
69ea7aa873
Merge pull request #597 from MITx/feature/victor/nested-links
...
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
Tom Giannattasio
3889388abf
Merge pull request #596 from MITx/features/kfiedler/multicourse-buttons
...
Make the two buttons that lead to the courseware more actionable
2012-08-31 13:19:03 -07:00
Tom Giannattasio
d8591c286d
basic discussion profile styles
2012-08-31 16:14:11 -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
Tom Giannattasio
b167e0f70a
added filter drop; tweaked sidebar coordinate settings to accommodate new post
2012-08-31 15:20:53 -04:00
David Ormsbee
04439a3217
add comments explaining prefetch need
2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209
Prefetch user groups to speed up auth checks required to render Progress page view for students
2012-08-31 15:16:31 -04:00
kimth
05da125aed
Merge pull request #600 from MITx/feature/kfiedler/hints
...
Added styles for problems
2012-08-31 10:30:50 -07:00
Kyle Fiedler
e6f9f8d9b0
Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure
2012-08-31 11:15:06 -04:00
John Jarvis
164dae71fb
Fixing syntax error
2012-08-31 10:09:15 -04:00
John Jarvis
66c5894e91
syntax error
2012-08-31 10:03:14 -04:00
John Jarvis
cef089f722
tracking log filename now determined by puppet, formatting cleanup
2012-08-31 09:38:13 -04:00
Carlos Andrés Rocha
20e48e6615
Merge pull request #475 from MITx/tmac/openid-provider
...
OpenID provider implementation
2012-08-31 06:23:03 -07:00
Tom Giannattasio
faabb01d42
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-31 09:17:12 -04:00
Tom Giannattasio
1515919f5e
fixed posted details margin bug
2012-08-31 09:16:59 -04:00
Arjun Singh
3f58e1dd01
Remove context from inline posts
2012-08-31 05:08:00 -07:00
Arjun Singh
7108985325
Adding context to posts in the forum view.
2012-08-31 04:59:12 -07:00
Arjun Singh
32cb0897e9
Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index.
2012-08-31 04:24:52 -07:00
Carlos Andrés Rocha
d702082daa
[34078525] Add test settings for openid
2012-08-31 06:31:18 -04:00
Arjun Singh
795c116389
populate dropdown
2012-08-31 03:27:02 -07:00
Matthew Mongeau
5bfb51681a
Display current topic and adjust font size.
2012-08-30 20:03:13 -04:00
Matthew Mongeau
28343b3afb
Hide menu when clicking body.
2012-08-30 19:50:00 -04:00
Matthew Mongeau
dc9f49b6d2
Show dropdown on click.
2012-08-30 19:43:38 -04:00
Victor Shnayder
d815d50aee
Remove obsolete eager flag for xml modulestore
...
* has to be eager
2012-08-30 19:26:50 -04:00
Victor Shnayder
021ccde1b4
Make jump_to work with the xml modulestore
...
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
2012-08-30 18:47:11 -04:00
Matthew Mongeau
3521d42175
Add highlighting back in
2012-08-30 17:46:23 -04:00
Matthew Mongeau
88100bf79f
Remove loading icon.
2012-08-30 17:04:37 -04:00
Matthew Mongeau
6a27f6ddc4
Track comment
2012-08-30 17:01:57 -04:00
Tom Giannattasio
000a745c6e
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-30 16:52:55 -04:00
Tom Giannattasio
a728134129
merge conflict fixes
2012-08-30 16:52:34 -04:00
Matthew Mongeau
31f7d6f4f4
Keep active thread active
2012-08-30 16:50:46 -04:00
Matthew Mongeau
074ba9ce71
Sorting
2012-08-30 16:44:10 -04:00
Victor Shnayder
22aa325d83
Enable linking into the middle of sequences
...
* add a url that has an extra /{position} at the end
* pass it through to get_module
2012-08-30 16:37:40 -04:00
Tom Giannattasio
da413f6de8
added sticky sidebar
2012-08-30 16:37:22 -04:00
