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

10941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
cbdf9ea25b studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling 2013-03-05 09:57:14 -05:00
Brian Talbot
dd82ea5738 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-04 12:47:23 -05:00
Brian Talbot
ec90d349e2 studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP 2013-03-04 12:47:07 -05:00
Brian Talbot
eb1658730a studio - alerts: revised border styling on all elements and button/color inheritance 2013-03-04 12:30:04 -05:00
Carlos Andrés Rocha
9b1ae9f99c Merge pull request #1583 from MITx/fix/ned/clean-ups 
Fix/ned/clean ups
 2013-03-04 08:11:29 -08:00
David Ormsbee
3a748b1e79 Merge pull request #1587 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-04 07:59:30 -08:00
Your Name
a9804a3349 proper tab 2013-03-04 10:57:37 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Ned Batchelder
97f1e04282 Fix some 2-space indents 2013-03-04 10:57:25 -05:00
Brian Talbot
72c58cd454 studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use 2013-03-03 20:44:48 -05:00
Brian Talbot
47aacc70b7 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-02 22:11:16 -05:00
Brian Talbot
bc0b1b0958 studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working 2013-03-02 22:06:55 -05:00
chrisndodge
999ed17e6d Merge pull request #1585 from MITx/fix/cdodge/fix-broken-test 
need to pass commit parameter
 2013-03-02 18:27:12 -08:00
Chris Dodge
3f9bc86c9e need to pass commit parameter 2013-03-02 21:26:24 -05:00
chrisndodge
f543ad4932 Merge pull request #1584 from MITx/fix/cdodge/fix-sporadic-test-error-in-metadata-inheritance 
do the metadata comparison on the parent not the course as we don't actu...
 2013-03-02 18:02:34 -08:00
Kevin Chugh
949c95ea00 better fix 2013-03-02 19:51:59 -05:00
Your Name
32e0c580f0 fix 2013-03-02 19:50:14 -05:00
Chris Dodge
bcea53d4b7 do the metadata comparison on the parent not the course as we don't actually know which vertical we ended up picking (could be arbitrary). 2013-03-02 19:36:11 -05:00
Victor Shnayder
310ecead36 Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-01 16:13:30 -08:00
Your Name
e1ef6a8323 clean up commments 2013-03-01 16:43:55 -05:00
Your Name
b7a6eadca4 new cohorts tested 2013-03-01 16:33:27 -05:00
chrisndodge
c236b2c8a9 Merge pull request #1550 from MITx/feature/cdodge/add-test-delete 
add another command line argument to allow users to only simulate a dele...
 2013-03-01 13:29:06 -08:00
Don Mitchell
afc2d66d07 Merge pull request #1578 from MITx/bug/christina/misc 
Don't usurp ValidatingView's error handling.
 2013-03-01 13:16:45 -08:00
David Ormsbee
bba96ee1d7 Merge pull request #1579 from MITx/feature/cdodge/preview-lms-base 
reapply Ike's pull-request in a new branch. The PR branch got mangled on...
 2013-03-01 12:59:02 -08:00
Chris Dodge
20540fbc2d update usage feedback 2013-03-01 15:52:27 -05:00
Victor Shnayder
88bfdd01ce Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice 
Feature/will/move correct mark for multiple choice
 2013-03-01 12:52:26 -08:00
Chris Dodge
0047295695 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete 2013-03-01 15:48:23 -05:00
Brian Talbot
2ce4ecbc84 local merge with master - finished 2013-03-01 15:48:15 -05:00
Brian Talbot
8552b2d614 local merge with master - WIP 2013-03-01 15:47:23 -05:00
chrisndodge
7fa77769c8 Merge pull request #1543 from MITx/feature/ichuang/turn-on-tracking-in-cms 
turn on tracking in CMS / Studio
 2013-03-01 12:47:01 -08:00
Brian Talbot
ad70581b80 studio - alerts: more progress including prompts 2013-03-01 15:43:07 -05:00
Chris Dodge
724c6c9eaa reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident. 2013-03-01 15:25:36 -05:00
cahrens
d7c28bfa11 Don't usurp ValidatingView's error handling. 
#219
 2013-03-01 15:24:56 -05:00
Don Mitchell
5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc 
Bug fix for #215 (quotes not rendering in text fields).
 2013-03-01 12:09:20 -08:00
jkarni
a204bff298 Merge pull request #1576 from MITx/feature/jkarni/newjsme 
Updated version of JSME.
 2013-03-01 11:58:19 -08:00
Julian Arni
3203360e9e Removed console.logs 2013-03-01 14:57:38 -05:00
cahrens
29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc. 
#213
 2013-03-01 14:55:38 -05:00
Julian Arni
b39bbec23e Fixed many more broken references in css 2013-03-01 14:43:28 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
David Ormsbee
11f864f489 Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime 
Limit remembered logins to 7 days, so that old cookies will eventually expire
 2013-03-01 11:37:46 -08:00
Julian Arni
6ccd496add Fixing broken split-button-arrow-focus link 2013-03-01 14:22:41 -05:00
Julian Arni
09ff623561 Updated version of JSME. 2013-03-01 13:38:35 -05:00
VikParuchuri
d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export 
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
 2013-03-01 09:32:08 -08:00
Calen Pennington
3908ada4ca Merge pull request #1575 from MITx/feature/edz/lock-requirements 
locking django-nose and numpy versions
 2013-03-01 09:20:09 -08:00
e0d
a3ed2d156d locking django-nose and numpy versions 2013-03-01 12:08:20 -05:00
David Ormsbee
d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode 
Fix capa save button msgs & add simple capa survey mode
 2013-03-01 08:26:21 -08:00
David Ormsbee
e1fcf4c317 Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries 
Reduce SQL queries in courseware by model caching a User's groups
 2013-03-01 08:24:30 -08:00
Calen Pennington
c581ecd897 Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions 
locking deps versions based on pip freeze in production.
 2013-03-01 08:10:56 -08:00
John Hess
b400b575d0 Merge pull request #1567 from MITx/jth/admindash 
Improved /admin_dashboard
 2013-03-01 07:56:32 -08:00
David Ormsbee
1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking 2013-03-01 10:54:57 -05:00