Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
16,013 Commits 1 Branch 0 Tags
6ee5eb2e4bf08e18baa8b16234152fc59e29b5ee
Commit Graph

16013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Arni
6ee5eb2e4b Cherry-pick and fix Toddi's commit. 
Which was giving git endless confusion on merge.
 2013-07-30 11:45:43 -04:00
Julian Arni
21fcdc7f3d Rename data docs straggler 2013-07-30 10:30:44 -04:00
Julian Arni
c0f6ec6cf5 Merge branch 'master' into jkarni/docs-merge 
Conflicts:
	docs/source/conf.py
 2013-07-30 10:23:35 -04:00
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
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
Christina Roberts
f2a9d6fb8e Merge pull request #519 from edx/christina/course_creators 
Change in signature for add_user_with_status_unrequested.
 2013-07-29 14:14:35 -07:00
Jim Abramson
1edf616110 Merge pull request #518 from edx/feature/jsa/us_username 
user_api: get username into user object
 2013-07-29 13:51:27 -07:00
cahrens
f347bd446b Change in signature for add_user_with_status_unrequested. 2013-07-29 16:48:59 -04:00
Peter Fogg
ee90ab68a9 Merge pull request #514 from edx/peter-fogg/test-metadata-save 
Add (currently failing) test case around saving metadata.
 2013-07-29 13:32:41 -07:00
Your Name
4afa5481dd set and get settings and fix discussion.css post-variable-apocalypse 2013-07-29 16:11:59 -04:00
Peter Fogg
0c9732024a Add (currently failing) test case around saving metadata. 2013-07-29 15:39:18 -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
David Baumgold
f9387506b4 Merge pull request #495 from dangtrinh/vi_branch 
Change git clone protocal to https
 2013-07-29 12:00:17 -07:00
Calen Pennington
f0d0da37f1 Merge pull request #454 from edx/cale/default-branch-info-for-release-email-script 
Default branch info for release email script
 2013-07-29 11:47:28 -07:00
Calen Pennington
8ed33b3dd5 Merge pull request #478 from edx/cale/xmodule-descriptor-studio-view 
Cale/xmodule descriptor studio view
 2013-07-29 11:43:29 -07: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
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
Calen Pennington
e648347381 Default branch info for release email script 2013-07-29 13:01:06 -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