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

4104 Commits

Author SHA1 Message Date
Sylvia Pearce
0f9b501d0b Update UI text for enrollment codes 2015-01-26 22:31:08 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20 
Rc/2015 01 20
 2015-01-23 16:10:28 -05:00
Carlos Andrés Rocha
6db7a7e688 Merge pull request #6751 from edx/release 
Release
 2015-01-23 16:10:00 -05:00
Chris Dodge
6bfe20b9a9 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-22 13:33:23 -05:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
David Baumgold
a72e129da5 Merge pull request #6532 from edx/course-about-i18n 
Improve i18n on course about page
 2015-01-21 10:23:59 -05:00
Chris Dodge
7faf5cc0f3 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state 2015-01-21 09:12:06 -05:00
Brandon DeRosier
24862edf1c Add gitlogs link to instructor dashboard 2015-01-20 18:55:42 -05:00
stephensanchez
3b5bd4e777 Making verification msg strings unicode friendly. 2015-01-20 21:41:57 +00:00
stephensanchez
891b952c99 Making verification msg strings unicode friendly. 2015-01-20 21:39:36 +00:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Diana Huang
134d2f57b2 Show an error when a student needs to reverify 
due to expiration.
 2015-01-20 14:51:08 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
chrisndodge
dde097c926 Merge pull request #6676 from edx/release 
Release
 2015-01-16 14:07:44 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Chris Dodge
5880401d9d add a missing check for an undefined object 2015-01-15 18:58:11 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Sarina Canelake
68b18a20b2 Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link 
Add link to sysadmin dashboard on core theme
 2015-01-15 16:08:25 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -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
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
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
Chris Rodriguez
e44ca91b2a Small accessibility fixes for cohorts 2015-01-15 10:33:49 -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
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
22d65acdbf Add back missing 'New Post" button 
TNL-1097
 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
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
Chris
9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. 2015-01-15 10:33:46 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
Marco Morales
c4e8673db0 creation of a courseware preview menu to contain staff view toggle. 2015-01-15 10:33:44 -05:00
David Baumgold
dffd8648b3 Missed an ellipsis 2015-01-15 10:19:58 -05:00
David Baumgold
37d965d6a7 Merge pull request #6629 from edx/remove-ellipses 
Remove all ellipses
 2015-01-15 10:05:16 -05:00
Renzo Lucioni
542509358e Merge pull request #6632 from edx/renzo/fix-logistration-icons 
Fix broken Font Awesome icons
 2015-01-15 09:30:29 -05:00
Sarina Canelake
66cdb71a74 Merge pull request #6609 from mitocw/bdero/fix-detailed-gitlogs 
Collapsible import logs in sysadmin dashboard
 2015-01-15 09:20:44 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
Awais
5b175cc0ca ECOM-887 Removed the "We have successfully verified your identity" line. 2015-01-15 14:52:14 +05:00