Adam Palay
2efcb0cdca
Change default names for various LMS components
...
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"
These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
Kevin Chugh
d95693ebb7
hook up panel to new stats service
2013-07-25 03:23:04 -04:00
Giulio Gratta
214a814b94
Adjustment to show sequence tool tips in LMS
2013-07-25 00:48:36 -04:00
Kevin Chugh
5d106ee048
Merge branch 'master' into feature/kevin/email_notifications_panel
2013-07-25 00:31:42 -04:00
Calen Pennington
76055aa211
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
Adam
420b092033
Merge pull request #467 from edx/fix/adam/file-upload
...
Fix/adam/file upload
2013-07-23 15:05:18 -07:00
Diana Huang
86ee2bca7a
Merge branch 'release'
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:57:07 -04:00
Diana Huang
2926c94330
Prevent XSS attack via submission_history page.
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
2013-07-23 17:23:59 -04:00
ihoover
c6c3e4b9d3
working under cms too
2013-07-23 16:23:54 -04:00
marco
77a23a37d0
reordered email settings checkbox to impact styling for icon and cleaned up header navigation for discusisons
2013-07-23 15:43:12 -04:00
Chris Dodge
c5ef8dc526
add line break between arguments
2013-07-23 12:15:56 -04:00
Chris Dodge
f78e3a221b
fix fat finger string formatting
2013-07-23 12:15:56 -04:00
Chris Dodge
345d2af540
address review feedback
2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb
added explicit unit test to verify the link rewriting
2013-07-23 12:15:55 -04:00
Chris Dodge
63c5cfda94
add comment and fix mistake in test
2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874
add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio
2013-07-23 12:10:49 -04:00
chrisndodge
8c94be8083
Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names
...
change from_xml class method on video class to make sure we honor the fa...
2013-07-23 08:33:27 -07:00
Alexander Kryklia
1eaba8b0b4
Merge pull request #41 from edx/alex/word_cloud_course_factory
...
Word cloud tests
2013-07-23 04:47:38 -07:00
Adam Palay
2b40462263
convert all datetime.now() to datetime.now(UTC)
2013-07-22 17:39:11 -04:00
Adam Palay
af522af2ca
formatting
2013-07-22 17:39:11 -04:00
marco
820544c1c4
pin and flag icons using fontawesome now render properly through inline discussions
2013-07-22 15:36:44 -04:00
marco
5b3cb53689
visual cleanup for discussion home bar
2013-07-22 15:17:10 -04:00
marco
747102cfc2
additional git rebase cleanup
2013-07-22 14:09:40 -04:00
marco
83b4dc634a
final cleanup from git rebase
2013-07-22 13:51:52 -04:00
marco
3495cebf31
modified html for discussion home to use tables instead of lists, cleaned up styling as well
2013-07-22 13:46:47 -04:00
marco
9eca557761
updated flag icons to be font-awesome based
2013-07-22 13:44:19 -04:00
marco
646ff9ea75
removed new post icon and added font-awesome replacement
2013-07-22 13:43:19 -04:00
marco
d8498bfbcf
new post button using font-awesome
2013-07-22 13:43:19 -04:00
marco
78ffc12ae0
cleaned up margin and padding to use baseline variable
2013-07-22 13:39:14 -04:00
marco
a9ea00aa27
removed border to the right of discussion list
2013-07-22 13:38:31 -04:00
marco
e87d07184d
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-07-22 13:20:27 -04:00
marco
e2f02cdf46
cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning
2013-07-22 13:16:09 -04:00
marco
37c9de7a01
cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
2013-07-22 13:07:53 -04:00
marco
2c9e4ca54a
addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.
2013-07-22 13:04:07 -04:00
marco
38e040ae0d
basic shell for discussion home page with both profile information and email notification settings
2013-07-22 11:55:29 -04:00
Greg Price
790328dfa8
Add acceptance test for one-click unsubscribe page
2013-07-22 11:50:26 -04:00
Greg Price
47b51e9329
Add endpoints to set user notification preference
...
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
2013-07-22 11:50:26 -04:00
marco
8d49007666
blankslate edited, header bar now with home button
2013-07-22 11:48:52 -04:00
marco
9c452935b5
updated pinning icons and removed images
2013-07-22 11:38:43 -04:00
marco
0e0ceb4806
updated flag icons to be font-awesome based
2013-07-22 11:37:57 -04:00
marco
642b649f76
removed new post icon and added font-awesome replacement
2013-07-22 10:58:58 -04:00
Greg Price
6a97ddf53c
Add an API to interact with users and preferences
...
The new API uses Django REST Framework. For now, it is designed specifically
to support the use cases required by the forum digest notifier (not yet built),
with a goal of making it more generally useful over time.
2013-07-22 10:57:18 -04:00
marco
e2779468e4
new post button using font-awesome
2013-07-22 10:26:38 -04:00
marco
90e60c1fb6
cleaned up topic header to allow for multiple line titles still being visible
2013-07-22 10:15:49 -04:00
marco
1a267a5067
removed icon stack from email area of helpgrid
2013-07-22 10:15:49 -04:00
marco
d2fae78824
icon color changes and profile link style to match profile page
2013-07-22 10:15:49 -04:00
marco
ff9f5714dd
sass build cleanup for baseline fixes
2013-07-22 10:15:49 -04:00
marco
a0f54aaf26
cleaned up margin and padding to use baseline variable
2013-07-22 10:15:49 -04:00
marco
b55b34ff0c
removed border to the right of discussion list
2013-07-22 10:15:06 -04:00
marco
f674e61f7a
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-07-22 10:15:06 -04:00
