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
Matthew Mongeau
6ee27d02e4
Searching and fixes.
2012-08-30 15:55:46 -04:00
John Jarvis
4c8ff6419e
Merge branch 'master' of github.com:MITx/mitx into jarv/add-local-logging
2012-08-30 15:37:04 -04:00
Tom Giannattasio
7ece39f345
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-30 13:38:05 -04:00
Tom Giannattasio
757c817b95
tweaked comment styles
2012-08-30 13:37:50 -04:00
Matthew Mongeau
3cc3876b74
Add new post back in.
2012-08-30 13:32:14 -04:00
Matthew Mongeau
476f4fa7ea
Fix liking.
2012-08-30 13:16:19 -04:00
David Ormsbee
a27ba692a8
Merge pull request #593 from MITx/feature/ichuang/fix-typo-in-lms-migration
...
missing "settings." in line in lms_migration
2012-08-30 10:11:09 -07:00
Matthew Mongeau
1acb6185de
Get math working.
2012-08-30 13:06:37 -04:00
Matthew Mongeau
afd6126e36
Fix some styles.
2012-08-30 12:43:02 -04:00
Matthew Mongeau
6287e43f55
Add ability to create replies.
2012-08-30 11:50:58 -04:00
Tom Giannattasio
5267f03b97
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-30 11:38:46 -04:00
Matthew Mongeau
362bbb1794
Close form
2012-08-30 11:38:34 -04:00
Tom Giannattasio
1559b86e27
added new post markup, style and basic interactions
2012-08-30 11:37:50 -04:00
Matthew Mongeau
abc0092fe1
Formatting around wmd
2012-08-30 11:23:06 -04:00
Carlos Andrés Rocha
87967b9eb8
[34078525] Makes OpenID provider login box modal.
2012-08-30 11:15:08 -04:00
Matthew Mongeau
04e8e5378c
Fix load order.
2012-08-30 11:12:16 -04:00
Victor Shnayder
4ce41c0111
fix course_ids for Berkeley internal courses and 3.091
2012-08-30 10:53:38 -04:00
Matthew Mongeau
24c7632664
Start responses.
2012-08-30 10:17:47 -04: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
02e6fd17e4
Make 'date' the first sort key since it's the new default (students seem to prefer it, especially since top is kind of unclear).
2012-08-29 22:20:20 -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
b13c5acd4f
Save the user's selected sort order on the comments service.
...
Requires cs_comments_service to have the field default_sort_key on users.
2012-08-29 22:13:37 -07:00
Ibrahim Awwal
7655e9eea0
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-29 22:13:37 -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
Ibrahim Awwal
e58af44620
Annotate comment content wrappers with classes for the roles of the author.
2012-08-29 19:41:46 -07:00
Ibrahim Awwal
08b233f603
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-29 19:41:14 -07:00
ichuang
cb07b0601e
missing "settings." in line in lms_migration
2012-08-29 22:04:39 -04:00
Arjun Singh
5d6bed863a
Fix discussions in xmodules
2012-08-29 16:41:01 -07:00
Carlos Andrés Rocha
902a887e79
[34078525] pep8 renaming of some extern_auth functions
2012-08-29 18:46:35 -04:00
Carlos Andrés Rocha
cd4aab13fb
[34078525] Added OPENID_PROVIDER_TRUSTED_ROOTS django setting
...
Added OPENID_PROVIDER_TRUSTED_ROOTS django setting. It should be a
list of glob matching patterns: ['*.cs50.net', '*.other.net']
Also did some minor refactoring and cleanup.
2012-08-29 18:40:12 -04:00
Matthew Mongeau
3a254380d5
Hook up comment counts
2012-08-29 17:26:18 -04:00
Arjun Singh
5c5d11409a
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 13:58:22 -07:00
Matthew Mongeau
f683d3750c
Show current following status in list view.
2012-08-29 16:52:39 -04:00
Matthew Mongeau
f23c8fa0d3
Comment details and comment voting.
2012-08-29 16:24:18 -04:00
Tom Giannattasio
30a42dd526
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-08-29 16:22:21 -04:00
Tom Giannattasio
5db29b87ee
tweaked sidebar styles; added temp javascript functionality for sidebar
2012-08-29 16:22:14 -04:00
Calen Pennington
99d6296b99
Set the course static file dir to /static directories in course repos if the folder exists, and fall back to including the whole course folder otherwise
2012-08-29 15:39:36 -04:00
Matthew Mongeau
d6bece9bd2
Move user to window. Mark followed threads in list view.
2012-08-29 15:37:23 -04:00
Matthew Mongeau
4735ce0ab1
Display comments and active thread.
2012-08-29 15:22:01 -04:00
Matthew Mongeau
13ae85ac35
Navigating threads.
2012-08-29 14:20:03 -04:00
