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

16546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mark L. Chang
8b6c2787f6 copy changes 2013-07-30 00:14:44 -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
Brian Talbot
611dab077f Studio: places 'add team member' call to course team view 2013-07-29 17:29:15 -04:00
David Ormsbee
3d8b32bb69 Reverting 89c48f4a30 to unbreak codejail for this release. 2013-07-29 17:18:52 -04:00
David Ormsbee
629b3d4d9d Merge branch 'master' into rc/2013-07-30 2013-07-29 17:15:35 -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
Brian Talbot
6980e9f175 Studio: bulletproofs actions on course team view 2013-07-29 16:36:45 -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
JonahStanley
ee46b3ef24 One click categories do not have animations 2013-07-29 15:58:23 -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
JonahStanley
419207ac3d Fixed issues with problem-editor.feature 2013-07-29 14:49:50 -04: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
David Baumgold
372992244c Removed course_info_handouts AJAX load 2013-07-29 14:30:16 -04:00
David Baumgold
5b9e283552 Load course info update template on page instead of via AJAX 2013-07-29 14:29:04 -04:00
David Baumgold
97fb08ab08 Make mitxmako.render_to_response not require a dictionary argument 2013-07-29 14:28:55 -04:00
David Baumgold
eac14615cd Load advanced_entry template on page, rather than via AJAX 2013-07-29 14:28:40 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
David Ormsbee
e6039c0270 Merge remote-tracking branch 'origin/release' into rc/2013-07-30 2013-07-29 14:05:26 -04:00
Your Name
7507921929 merge with Marcos new design 2013-07-29 13:58:08 -04:00
JonahStanley
3bc34d71a9 Changed version requirement in testing.md 2013-07-29 13:52:02 -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
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
David Baumgold
64566c14e6 Fix unit tests 2013-07-29 13:12:07 -04:00
David Baumgold
e4bd8622d9 Updated changelog for course team admin story 2013-07-29 13:12:06 -04:00
David Baumgold
0bd25c05e2 Fix up lettuce tests for course team page redesign 2013-07-29 13:12:06 -04:00
David Baumgold
36a10876c0 Fix variable scoping issue in Mako template 2013-07-29 13:12:06 -04:00
Brian Talbot
deced24b32 Studio: refactored form-based Sass and revised markup/copy for course team admin mgmt 2013-07-29 13:12:06 -04:00
David Baumgold
e5ef5ef1a0 Show disabled trash icon instead of not showing it at all 2013-07-29 13:12:06 -04:00
David Baumgold
41832744d7 Correct course team admin badging logic 2013-07-29 13:12:06 -04:00
David Baumgold
ecf855eba7 Fixup translations 2013-07-29 13:12:05 -04:00
David Baumgold
5738e4f79d Pull correct URL when changing user permissions for course team 2013-07-29 13:12:05 -04:00
David Baumgold
91f192f6b5 Added error prompts for the course team page 2013-07-29 13:12:05 -04:00
Brian Talbot
4a2b5519ba Studio: styles new user role controls and revamps course team UI 2013-07-29 13:12:05 -04:00