Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,980 Commits 1 Branch 0 Tags
4f7edbf67daa140aa322cf9eabc41d734e52946a
Commit Graph

15980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chugh
4f7edbf67d fix notifications URL 2013-07-30 01:50:33 -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
79994b5d69 Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel 2013-07-30 00:56:06 -04:00
Kevin Chugh
8f98a1c2be remove failing jasmine tests and print statements 2013-07-30 00:46:47 -04:00
jsa
0207255e1f fix strange comment typo 2013-07-30 00:14:10 -04:00
Kevin Chugh
99f235ec56 first pass at jasmine tests 2013-07-30 00:13:03 -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
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
Adam
50ef0d1c09 Merge pull request #503 from edx/fix/back-button 
fixes back nav button
 2013-07-29 10:29:40 -07:00
Your Name
6276997180 update checkbox with get settings 2013-07-29 13:26:31 -04:00
Christina Roberts
4c35a0f1bb Merge pull request #488 from edx/christina/emails 
Send e-mails when course creator status changes.
 2013-07-29 10:02:05 -07:00
cahrens
087d35c95e Studio course creator e-mails. 2013-07-29 13:01:37 -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
Don Mitchell
393aa1da26 Ensure parent update of children decaches correctly 2013-07-29 12:23:19 -04: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
a96099868d Merge pull request #486 from edx/talbs/mktg-vizsync 
edx.org Login, Register, and iframe-based button visual sync
 2013-07-29 07:22:22 -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
cahrens
b5506cf20b Copy changes. 2013-07-29 09:51:10 -04:00
cahrens
15665bbe5a Formatting updates. 2013-07-29 09:49:37 -04:00
cahrens
23894d20f8 E-mail notifications to users when course creator status changes. 2013-07-29 09:49:37 -04:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Brian Talbot
8a715c1a16 Studio: using defined red color variables for error-based system messages 2013-07-25 17:09:57 -04:00
Sarina Canelake
b143de1f99 Merge pull request #502 from edx/sarina/fix-discussion-acceptance 
Fix failing acceptance test
 2013-07-25 13:23:27 -07:00
Adam Palay
62a54555b6 fixes back nav button 2013-07-25 15:32:43 -04:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
a90d7b5dbb Merge pull request #491 from edx/lettuce-improvements 
Misc improvements to make lettuce testing a bit saner
 2013-07-25 11:37:50 -07: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
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Calen Pennington
c6b5178261 Merge pull request #498 from edx/cale/make-the-service-variant-flag-on-manage.py-longform-only 
Make the service-variant flag on manage.py longform only
 2013-07-25 09:38:24 -07:00
cahrens
628994daf1 i18n "Create a New Course". 2013-07-25 12:25:06 -04:00
cahrens
60d60de2c4 Use format for strings instead of %. 2013-07-25 12:21:17 -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