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

10510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
dc60d107e9 edx.org - added in new login and registration visual banners per marketing request 2013-03-19 09:53:52 -04:00
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -04:00
Brian Talbot
6f2e6116f9 LMS - adding back in a Sass mixin that seems to still have dependencies 2013-02-21 09:16:06 -05:00
John Jarvis
342220f0f4 js syntax 2013-02-20 18:50:16 -05:00
John Jarvis
4b93ef491b errors for login and reg 2013-02-20 18:23:41 -05:00
Brian Talbot
f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages 2013-02-20 09:15:27 -05:00
John Jarvis
2a6fde9db2 javascript to redirect to the course being accessed 2013-02-19 20:42:38 -05:00
John Jarvis
fd36c555a6 Renaming login url for modal-less login 2013-02-19 19:36:32 -05:00
John Jarvis
bfbd7de042 Adding baseFontColor to _variables.scss 2013-02-19 19:36:15 -05:00
Brian Talbot
6f922570ff made flex-grid references consistent within different page element Sass files 2013-02-19 17:36:28 -05:00
Brian Talbot
d14c8e2585 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:32:25 -05:00
Brian Talbot
074f866b58 resolving some light footer display issues 2013-02-19 17:32:17 -05:00
John Jarvis
4596fa417f Changing login and signin view names 2013-02-19 17:31:22 -05:00
Brian Talbot
b2839514f2 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:22:57 -05:00
John Jarvis
dabcb51746 resolving merge conflicts 2013-02-19 12:43:06 -05:00
VikParuchuri
0db6247d96 Merge pull request #1513 from MITx/feature/vik/improve-oe-ui 
Skip self assessment test (fails due to need for querydict for getlist t...
 2013-02-19 08:15:42 -08:00
Vik Paruchuri
9ee956a397 Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful) 2013-02-19 11:05:43 -05:00
Calen Pennington
956789e510 Merge pull request #1512 from MITx/fix/zoldak/coveragerc 
Omit migrations from code coverage reports.
 2013-02-19 07:57:09 -08:00
Jay Zoldak
2e85ba1a27 Omit migrations from code coverage reports. 
Also omit portal and terrain, which are used for the lettuce testing framework.
 2013-02-19 10:54:02 -05:00
Diana Huang
f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui 
Feature/vik/improve oe ui
 2013-02-19 07:27:29 -08:00
Christina Roberts
a62a575a33 Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding 
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
 2013-02-19 06:34:32 -08:00
Don Mitchell
cfa13922f5 Change url for login from login to signin. 2013-02-15 17:30:24 -05:00
Diana Huang
3e23b9e1f2 Merge pull request #1480 from MITx/diana/staff-grading-flagging 
Flag submissions from staff grading view
 2013-02-15 13:08:16 -08:00
cahrens
5acf9cb3d2 Reformat to 4 spaces. 2013-02-15 14:46:41 -05:00
cahrens
2486ebc22a Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-15 14:45:20 -05:00
Brian Talbot
86d9f0b65c resolving local merge 2013-02-15 14:15:51 -05:00
cahrens
37e4cd81b1 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 2013-02-15 14:15:03 -05:00
Brian Talbot
93949ab342 resolving local merge problem 2013-02-15 14:12:46 -05:00
Brian Talbot
a5e2b5c53a resolving merge conflict and missing Sass mixin 2013-02-15 14:10:52 -05:00
Jay Zoldak
34a4b35e66 Fix lettuce acceptance tests to reflect the new soft landing page changes. 2013-02-15 14:07:46 -05:00
cahrens
b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding 2013-02-15 13:14:46 -05:00
Christina Roberts
dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent 
Feature/marco/addcomponent
 2013-02-15 10:13:24 -08:00
Don Mitchell
c4586edb2e Change hardcoded template names to the newer hardcoded template names 
:-(
 2013-02-15 12:03:04 -05:00
Carlos Andrés Rocha
86865a6823 Merge pull request #1507 from MITx/bugfix/valera/video_alpha 
Bugfix/valera/video alpha
 2013-02-15 08:22:25 -08:00
Valera Rozuvan
c7679ea624 Removed debugging comments. 2013-02-15 18:12:53 +02:00
Valera Rozuvan
a0f46dae49 Fixed bug that prevented Firefox from playing HTML5 video content. 2013-02-15 18:10:14 +02:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
Don Mitchell
bfcc0559a7 Merge pull request #1503 from MITx/fix/cdodge/export-policy-json 
add exporting of policy.json
 2013-02-14 12:47:37 -08:00
Victor Shnayder
cc7a97082a Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 
fix module staff accesss - by has_access, not by user.is_staff
 2013-02-14 12:08:56 -08:00
Victor Shnayder
cb37bf7326 Merge pull request #1504 from MITx/feature/victor/foldit-api 
Better logging, and make view csrf exempt...
 2013-02-14 12:05:04 -08:00
Victor Shnayder
723012b2bb Better logging, and make view csrf exempt... 2013-02-14 14:50:18 -05:00
Chris Dodge
ea068d4aa8 add exporting of policy.json 2013-02-14 14:19:38 -05:00
Victor Shnayder
2388770c25 Merge pull request #1502 from MITx/feature/victor/foldit-api 
Feature/victor/foldit api
 2013-02-14 10:36:12 -08:00
Victor Shnayder
1108137dc3 Address Cale's comment--make property a simple class var 2013-02-14 13:24:21 -05:00
Victor Shnayder
d7f9bdda66 Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. 2013-02-14 13:23:58 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Victor Shnayder
fffbb55944 Make hidden_module not cause 500 errors by adding a get_html() 2013-02-14 12:45:01 -05:00
Victor Shnayder
21dab27ed6 fix logger name in module_render 2013-02-14 12:45:01 -05:00
Mark L. Chang
859cfff870 updated modal copy and alt text 2013-02-14 12:42:17 -05:00