Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
0ef56bb06c Merge pull request #830 from MITx/feature/tomg/cms-style-cleanup 
Random style updates
 2012-10-05 11:06:06 -07:00
Victor Shnayder
7e304abec2 Merge pull request #833 from MITx/feature/rocha/openid-djangostore 
Fix error when creating empty associations
 2012-10-05 10:57:45 -07:00
Victor Shnayder
82d3adc5fb Merge pull request #831 from MITx/feature/victor/code-output-style 
move output right/wrong image to top left of each test instead of center
 2012-10-05 10:49:51 -07:00
Carlos Andrés Rocha
193ca7b34b Fix error when creating empty associations 
Also renamed some variables to make them more distinguishable
 2012-10-05 13:46:49 -04:00
Chris Dodge
95e15c4455 time/date setting on Release Date and Due date 2012-10-05 13:17:51 -04:00
Victor Shnayder
8578320e3d move output right/wrong image to top left of each test instead of center 2012-10-05 13:06:26 -04:00
Victor Shnayder
4fd530dbac fix python syntax in template for adding google analytics 2012-10-05 11:49:17 -04:00
Victor Shnayder
9496064943 Merge pull request #821 from MITx/feature/rocha/openid-djangostore 
Use django cache for OpenID provider store
 2012-10-05 08:41:18 -07:00
Tom Giannattasio
24247dc0b9 cross-browser css3 2012-10-05 10:29:36 -04:00
Chris Dodge
758c446929 wip on setting date/times on subsection page 2012-10-05 09:56:07 -04:00
Tom Giannattasio
1e68123e09 fixed sign up to log in text 2012-10-05 09:21:20 -04:00
Tom Giannattasio
842306addd updated styles and template for unit location tree 2012-10-05 09:18:10 -04:00
kimth
79996f20a4 Merge pull request #827 from MITx/bug/tomg/vote-button 
changed vote button icon display mode to fight zoom bugs
 2012-10-04 20:07:29 -07:00
Tom Giannattasio
fbae5d9e71 fixed courseware overview search positioning 2012-10-04 17:08:19 -04:00
Tom Giannattasio
61ea9d3678 fixed log in header and overview search 2012-10-04 17:08:19 -04:00
Tom Giannattasio
ebd3f28de8 added padding to xmodule units 2012-10-04 17:08:19 -04:00
Tom Giannattasio
1804d5410c fixed ie banner showing outside of courseware bug 2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905 added ie warning banner to courseware; displayed by ie conditional stylesheet 2012-10-04 15:34:50 -04:00
Chris Dodge
3b38070d38 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 2012-10-04 14:54:50 -04:00
Chris Dodge
c3aa86f1fb remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir 2012-10-04 14:53:43 -04:00
Tom Giannattasio
69f8734893 changed vote button icon display mode to fight zoom bugs 2012-10-04 14:09:01 -04:00
Calen Pennington
580164e192 Merge pull request #826 from MITx/feature/cdodge/subsection-edit-page 
Feature/cdodge/subsection edit page
 2012-10-04 11:01:37 -07:00
Chris Dodge
fe42f6fd22 address pull request feedback 2012-10-04 14:00:25 -04:00
Chris Dodge
48d84c2e3d support reordering of units inside subsection list 2012-10-04 13:44:46 -04:00
Chris Dodge
d93bf63dff save display_name and subtitle metadata 2012-10-04 13:05:45 -04:00
Chris Dodge
29c142e3dc need to wire through the new unit template location to the edit unit page 2012-10-04 11:09:28 -04:00
Chris Dodge
322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
 2012-10-04 11:03:37 -04:00
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
chrisndodge
ab7377dc98 Merge pull request #819 from MITx/feature/cale/cas-unit-location-view 
Wire up the unit location display
 2012-10-04 07:57:11 -07:00
Calen Pennington
612e5fe8c4 Merge pull request #822 from MITx/feature/tomg/labs-signup 
added course page with log in and sign up
 2012-10-04 07:55:27 -07:00
Calen Pennington
41b0eb9df4 Merge pull request #824 from MITx/feature/tomg/google-analytics 
added google analytics to all pages without a course object
 2012-10-04 07:54:29 -07:00
Calen Pennington
b182b6e43e Merge pull request #823 from MITx/hotfix/rocha/create-dev-for-os-x-10.8 
Fix create-dev-env script for Mac OS 10.8 and latest stable rvm
 2012-10-04 07:45:37 -07:00
Tom Giannattasio
92e830df24 more explicit temporary status on landing page 2012-10-04 10:37:46 -04:00
Victor Shnayder
5b79352aba Merge pull request #806 from MITx/feature/rocha/support-additional-video-sources 
Add support for video download link
 2012-10-03 17:15:46 -07:00
Tom Giannattasio
33378bbafd added google analytics to all pages without a course object 2012-10-03 19:33:12 -04:00
Carlos Andrés Rocha
2c5047fde4 Fix create-dev-env script for Mac OS 10.8 and latest stable rvm 2012-10-03 19:02:02 -04:00
Tom Giannattasio
cd64f92171 h1 float fix 2012-10-03 17:27:42 -04:00
Tom Giannattasio
145be8c895 added landing styles 2012-10-03 17:26:14 -04:00
Tom Giannattasio
249d25204b added temp labs logo 2012-10-03 17:26:14 -04:00
Tom Giannattasio
6b4d9ba0cd setup landing template 2012-10-03 17:26:14 -04:00
Tom Giannattasio
ea1b7caf47 consistent field labels 2012-10-03 17:23:48 -04:00
Tom Giannattasio
5a26dd7eba removed extraneous border on log in extras 2012-10-03 17:23:48 -04:00
Tom Giannattasio
277cc3433c added no-header class to login.html 2012-10-03 17:23:48 -04:00
Tom Giannattasio
222d23dfd3 added class to remove header 2012-10-03 17:23:48 -04:00
Tom Giannattasio
f4ccb335e5 abstracted classes to work for both log in and sign up forms 2012-10-03 17:23:48 -04:00
Tom Giannattasio
d44d9ff2d1 tweaked signup template 2012-10-03 17:23:48 -04:00
Carlos Andrés Rocha
e62968d5e1 Get OpenID XRDS url host from request 
Replaced the previous method of getting it from HTTP_POST to use
django's mechanism, which may or may not use HTTP_HOST. However if an
attacker changes the request header, there is not much he can do since
he cannot recreate the association nonce.
 2012-10-03 17:16:22 -04:00
Carlos Andrés Rocha
4840de8c88 Create Django cache backed OpenID provider store 2012-10-03 16:54:07 -04:00
Victor Shnayder
607fdb020b Merge pull request #820 from MITx/ned/spaces_in_codemirror 
Now when you hit the TAB key in codemirror, it will insert 4 spaces.
 2012-10-03 13:24:47 -07:00
Chris Dodge
1240325c69 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page 
Conflicts:
	cms/static/js/base.js
 2012-10-03 16:24:38 -04:00