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

16052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
ae77795fc1 fix small - and harmless - typo in a test field setting 2013-07-30 17:20:10 -04:00
Chris Dodge
e23b693d90 put a 4th field in the create new course form where the user must specify a course_run. Also update unit tests to also provide this 4th parameter. Styling changes to better lay out the form fields are still TBD. 2013-07-30 17:20:09 -04:00
David Baumgold
7d7513b6fe Merge pull request #470 from edx/db/course-team-admin-grants 
Grant admin rights to members of the course team
 2013-07-30 13:36:56 -07:00
David Baumgold
0022469e07 Change "user" to "admin" in course team BDD descriptions 2013-07-30 15:14:20 -04:00
David Baumgold
eaac4f8bdc Add a lettuce test for course team admins removing admin status 2013-07-30 14:24:17 -04:00
Brian Talbot
573445aa8c Studio: adds badge UI firefox fix 2013-07-30 14:01:17 -04:00
Brian Talbot
7a41855fdb Studio: adds logic to show add new user to team view 2013-07-30 14:00:58 -04:00
David Baumgold
fba50589ff Add a lettuce test for course team admins granting admin status 2013-07-30 13:48:43 -04:00
Brian Talbot
c82ad6cdaa Studio: revises badge and create call to action design 2013-07-30 13:19:39 -04:00
Brian Talbot
2161961f64 Studio: corrects legend element copy on new user form 2013-07-30 13:18:56 -04:00
Don Mitchell
6a7fa41e03 Merge pull request #526 from edx/dhm/yacibug 
Yet another Course Info bug
 2013-07-30 09:54:16 -07:00
Carlos Andrés Rocha
5b30c06b75 Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics 
Show dates when the data was collected in the instructor dashboard panel
 2013-07-30 09:11:58 -07:00
Don Mitchell
1fb4354a12 Wrap malformed course_update rather than silently failing update 2013-07-30 12:08:57 -04:00
Don Mitchell
27d32f1932 Test reproducing the error: malformed course_update silently failing update 2013-07-30 12:01:15 -04:00
Kevin Chugh
4de1ab2de8 Merge pull request #523 from edx/feature/kevin/notifications_panel_xmodule_workaround 
fix for underscore template issue for xmodules
 2013-07-30 08:46:40 -07:00
David Baumgold
71bb527022 Merge pull request #515 from edx/db/template-improvements 
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
 2013-07-30 08:24:54 -07:00
David Baumgold
4f5c2cce75 Re-added missing render() call 2013-07-30 11:22:13 -04:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Your Name
56c8057ed0 fix for underscore template issue for xmodules 2013-07-30 10:34:36 -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
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
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
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