jsa
33d4ae69dd
add feature flag to enable/disable discussion home panel
2013-07-29 18:13:12 -04:00
Your Name
4afa5481dd
set and get settings and fix discussion.css post-variable-apocalypse
2013-07-29 16:11:59 -04:00
Your Name
7507921929
merge with Marcos new design
2013-07-29 13:58:08 -04:00
Your Name
13ca61ba7f
fix merge conflict with _variables.scss
2013-07-29 13:32:54 -04:00
Your Name
6276997180
update checkbox with get settings
2013-07-29 13:26:31 -04:00
Don Mitchell
0578175a7c
Merge pull request #505 from edx/dhm/xblock_save
...
More xblock.save() calls to handle fields set during inits
2013-07-29 09:34:46 -07:00
David Ormsbee
d453f47b72
Merge pull request #501 from edx/gprice/user-api-tweaks
...
User API Tweaks
2013-07-29 09:12:49 -07:00
Brian Talbot
2ee140eb79
edx.org: syncing up capitalization of register/login submit button copy
2013-07-29 10:21:54 -04:00
Brian Talbot
d61e4e50ec
edx.org: abstracting new edx.org button extends and colors with other themes in mind
2013-07-29 10:21:54 -04:00
Brian Talbot
049794463a
edx.org: revising base link color variable to use darker value for accessibility
2013-07-29 10:21:54 -04:00
Brian Talbot
76b0a03bc2
edx.org: revises iframe-based register/status buttons to match revised styles
2013-07-29 10:21:54 -04:00
Brian Talbot
10964eec88
edx.org: handles letter-spacing on buttons
2013-07-29 10:21:54 -04:00
Brian Talbot
69c792f5e9
edx.org: applies edx.org visual changes (with overrides/new mixins)
2013-07-29 10:21:53 -04:00
Brian Talbot
71c3f5e5a7
edx.org: adds in variables/mixins to support edx.org visual changes
2013-07-29 10:21:53 -04:00
Don Mitchell
d1ed6fbc34
More xblock.save() calls to handle fields set during inits
2013-07-29 09:08:37 -04:00
Greg Price
dc90736b5b
Allow user id filtering in user preference API
2013-07-25 14:19:29 -04:00
Greg Price
6418a1cf5b
Allow user API access in dev environments
...
This is achieved by allowing access if settings.DEBUG is True and
settings.EDX_API_KEY is not set or None (which is true for dev.py)
2013-07-25 14:02:43 -04:00
ihoover
aad6dc4345
Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
...
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
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
