Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
b9bd659861 Merge pull request #6654 from edx/merge-release-into-master 
Merge release into master
 2015-01-15 16:00:38 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
chrisndodge
c4cd94d756 Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix 
fix the redemption page cross browser issue on safari
 2015-01-15 14:57:05 -05:00
Adam Palay
4381ccd463 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-01-15 14:51:34 -05:00
David Baumgold
b390e18d34 Improve i18n on course about page 2015-01-15 14:38:17 -05:00
Adam
c281096f68 Merge pull request #6648 from edx/hotfix/2015-01-15 
Fixed unicode error in CSV grade report generation.
 2015-01-15 14:28:48 -05:00
Jesse Zoldak
adc64122ae Merge pull request #6649 from jzoldak/zoldak/fix-yt-stub 
Request the iframe API from youtube in tests every time it is needed
 2015-01-15 13:25:52 -05:00
Ben Patterson
fc74af6772 Remove tddium-only scripts. 2015-01-15 13:15:18 -05:00
Awais Qureshi
5959edb493 Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message 
ECOM-887 Removed the "We have successfully verified your identity" line.
 2015-01-15 23:12:58 +05:00
Jesse Zoldak
3bdee98f4c Request the iframe API from youtube in tests every time it is needed 
TNL-454
 2015-01-15 12:04:57 -05:00
Mark Hoeber
c95d90a328 Merge pull request #6604 from edx/markhoeber-developer-guide-move 
Notice on Developer's Guide move
 2015-01-15 11:58:29 -05:00
David Baumgold
b3fda9c561 Merge pull request #6646 from edx/missed-an-ellipses 
Missed an ellipsis
 2015-01-15 11:56:03 -05:00
Chris Dodge
1fcca3a942 add back inclusion of the receipt_custom_pane.html at the bottom of the receipt page 2015-01-15 11:50:15 -05:00
Christina Roberts
2897a8efb3 Merge pull request #6299 from edx/cohorted-courseware 
Cohorted courseware
 2015-01-15 11:50:13 -05:00
Waheed Ahmed
373f8e82f3 Fixed unicode error in CSV grade report generation. 
TNL-1196
 2015-01-15 11:47:25 -05:00
John Eskew
9e20057da1 Merge pull request #6478 from edx/jeskew/change_handled_exception_for_assets 
Handle the correct exception upon asset not found.
 2015-01-15 10:44:01 -05:00
jsa
0049c97d8f use bulk_ops on course_about 2015-01-15 10:37:25 -05:00
cahrens
9607aa233c Remove unnecessary pylint suppression. 
Possibly caused by a bad merge.
 2015-01-15 10:37:25 -05:00
Brian Talbot
69ed266f7e Studio: removing left whitespace from icons in unit visibility controls 2015-01-15 10:37:25 -05:00
Frances Botsford
6398af715a Make group config styles generic 2015-01-15 10:37:25 -05:00
cahrens
39acbdcb2b End-to-end bok choy test for cohorted courseware. 2015-01-15 10:37:25 -05:00
Frances Botsford
8abec98c3d fixed group config sidebar spacing, icon cleanup 2015-01-15 10:37:25 -05:00
cahrens
66375b8541 Bok choy test for editing of content groups on Group Configuration page. 2015-01-15 10:37:24 -05:00
Frances Botsford
ebeb9a9948 added cohort group editing styles 2015-01-15 10:37:24 -05:00
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Chris Rodriguez
e44ca91b2a Small accessibility fixes for cohorts 2015-01-15 10:33:49 -05:00
Frances Botsford
4f99657b6d first pass at adding cohort groups to group configuration page 2015-01-15 10:33:49 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
798342e177 Rename 'cohorted content group' to 'content group' 2015-01-15 10:33:48 -05:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
cahrens
1897fb65f9 Update for paged container not having a visibility editor. 2015-01-15 10:33:48 -05:00
cahrens
4b00566e4d Update course access check. 2015-01-15 10:33:48 -05:00
Don Mitchell
c86f235275 Test xml get_parent for a non-tree 
course
TNL-1012
 2015-01-15 10:33:48 -05:00
cahrens
5de170ff59 Short-circuit group_access check if only user_partitions are split_test partitions. 2015-01-15 10:33:48 -05:00
Chris Rodriguez
e2f7f343bd Fixing padding issues 2015-01-15 10:33:47 -05:00
Brian Talbot
8928f85fbf Cohorted Courseware: resolving missing icon from add group button in 'nohorts' scenario 2015-01-15 10:33:47 -05:00
Brian Talbot
d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech 
TNL-1137
 2015-01-15 10:33:47 -05:00
Andy Armstrong
f58e96a2fa Fix quality failures 2015-01-15 10:33:47 -05:00
Andy Armstrong
22d65acdbf Add back missing 'New Post" button 
TNL-1097
 2015-01-15 10:33:47 -05:00
cahrens
39d9fdee34 Stop using to_deprecated_string. 2015-01-15 10:33:47 -05:00
Andy Armstrong
42c4071869 Implement better select handling and tests 2015-01-15 10:33:47 -05:00
Chris Rodriguez
54a8a4fccb Addressing items in the latest PR; includes RTL-ifying all SCSS 2015-01-15 10:33:47 -05:00
cahrens
79cd321028 Bok choy test improvements. 2015-01-15 10:33:46 -05:00
Andy Armstrong
fc5b94eeeb Address most of Christina's code review comments 2015-01-15 10:33:46 -05:00
cahrens
8e787b4f03 New bok choy tests for content group linking. 2015-01-15 10:33:46 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard 
TNL-653
 2015-01-15 10:33:46 -05:00
Andy Armstrong
674bfc4fcb Use edx namespace for Backbone classes 2015-01-15 10:33:46 -05:00
cahrens
5ea7ced900 Create a RESTful handle_cohort view method for GET and PUT/POST. 2015-01-15 10:33:46 -05:00
Chris
9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. 2015-01-15 10:33:46 -05:00