Jim Abramson
77a796e2c7
Merge pull request #520 from edx/feature/kevin/email_notifications_panel
...
Feature/kevin/email notifications panel
2013-07-30 05:30:56 -07:00
Diana Huang
0d10a872c8
Merge pull request #499 from edx/diana/login-redirect
...
Only redirect when redirect url is an internal page.
2013-07-30 05:29:39 -07:00
Jim Abramson
98fe2d495a
Merge pull request #517 from edx/bug/jsa/edx_api_key
...
add EDX_API_KEY to aws.py
2013-07-30 04:05:39 -07:00
jsa
05f31f8bf1
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-30 02:31:05 -04:00
jsa
7a7c070999
notification_prefs/views: correct docstring
2013-07-30 02:30:45 -04:00
Kevin Chugh
e1e591f8bf
address code review comments
2013-07-30 01:55:20 -04:00
Kevin Chugh
c3e609fe40
fix merge conflict
2013-07-30 01:44:40 -04:00
Kevin Chugh
5c91edd4a5
update coffeescript to use new status url
2013-07-30 01:43:49 -04:00
jsa
908fd46f4d
notification_prefs: add ajax endpoint to get preference status
2013-07-30 01:43:01 -04:00
Kevin Chugh
986a2cdec2
Merge branch 'feature/kevin/email_notifications_panel' of github.com:edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-30 01:19:31 -04:00
Kevin Chugh
803b92fc9a
add ajax endpoint for getting notifications status
2013-07-30 01:19:15 -04:00
jsa
0207255e1f
fix strange comment typo
2013-07-30 00:14:10 -04:00
Kevin Chugh
62f6e2d52b
home button working, default to home when no thread selected
2013-07-29 23:33:50 -04:00
Your Name
47dbf2e6cb
updates but getting status and setting status not working
2013-07-29 18:33:19 -04:00
jsa
06eb5cdd93
Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel
2013-07-29 18:13:46 -04:00
jsa
33d4ae69dd
add feature flag to enable/disable discussion home panel
2013-07-29 18:13:12 -04:00
marco
b7d6d77464
visual cleanup for email icon and discussion context label post branch merge
2013-07-29 17:49:34 -04:00
David Ormsbee
3d8b32bb69
Reverting 89c48f4a30 to unbreak codejail for this release.
2013-07-29 17:18:52 -04:00
Your Name
4afa5481dd
set and get settings and fix discussion.css post-variable-apocalypse
2013-07-29 16:11:59 -04:00
jsa
6463bcae6c
user_api: get username into user object
...
so it can be used to generate unsubscribe tokens
2013-07-29 15:20:08 -04:00
Jim Abramson
8ccaf623f1
add EDX_API_KEY to aws.py
2013-07-29 15:16:37 -04:00
Diana Huang
d1b503d53a
Only redirect when redirect url is an internal page.
2013-07-29 14:18:04 -04:00
Your Name
7507921929
merge with Marcos new design
2013-07-29 13:58:08 -04:00
JonahStanley
20ce33dcdb
Fixed broken tests from chrome versioning
2013-07-29 13:38:27 -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
Kristin Stephens
71a1562e21
Fix offline_gradecalc
...
Bug: Throws error when can't find a user on the request object for grading or can't find a session attribute.
Fix: Added a user attribute with a value of the current student and a session attribute with a value of an empty dictionary.
2013-07-25 14:31:20 -07:00
Vik Paruchuri
12a2c06fb1
Remove console.log statements
2013-07-25 15:57:21 -04:00
Vik Paruchuri
29bd64555f
Get table to take up the width of the page
2013-07-25 15:30:11 -04:00
Vik Paruchuri
d23d354ab3
Change top text
2013-07-25 14:41:54 -04:00
Vik Paruchuri
172bc5cfa5
Change naming, edit border radius
2013-07-25 14:23:11 -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
Vik Paruchuri
c059a31623
Fix border locations, remove open ended response text
2013-07-25 12:33:12 -04:00
Vik Paruchuri
5ae6ce9d47
Add in css borders
2013-07-25 12:10:16 -04:00
Vik Paruchuri
579b66d9dd
Redesign header css
2013-07-25 11:44:42 -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
Vik Paruchuri
5365d54202
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-07-25 11:09:53 -04: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
