Commit Graph

1483 Commits

Author SHA1 Message Date
Kyle Fiedler
26c6fe29c1 Added tooltip for time on video 2012-04-04 10:26:13 -04:00
Kyle Fiedler
1016843ae2 Added style and js for speed picker and hover for scrubber 2012-04-04 10:26:13 -04:00
Kyle Fiedler
ca69dc632f Added styles for the captions and video bar 2012-04-04 10:26:13 -04:00
Kyle Fiedler
77bd47f749 Added some styles to make videos more cohesive 2012-04-04 10:26:12 -04:00
Kyle Fiedler
ceb8d4bf5b fix some small css bugs in askbot 2012-04-03 16:48:00 -04:00
Piotr Mitros
cec1ecf952 Merge branch 'master' of github.com:MITx/mitx 2012-04-03 16:21:29 -04:00
Kyle Fiedler
3111bdd3a0 Added specificity to the input styles for password reset 2012-04-03 16:18:15 -04:00
Piotr Mitros
e2e9f8904e Gradebook bug. Maybe fixed? Maybe not? Deploy debugging. 2012-04-03 15:59:58 -04:00
Piotr Mitros
df637d32a2 Typo in gradebook 2012-04-03 15:56:14 -04:00
Monitor Machine
0c69e00932 Settings has a default sqlite database 2012-03-30 18:22:44 -04:00
Monitor Machine
c121f2b024 Django version restriction 2012-03-30 09:16:11 -04:00
Piotr Mitros
cd1226814a Typo 2012-03-29 15:01:45 -04:00
Piotr Mitros
1ddf41ab1c Missed one conversion to complex 2012-03-29 15:00:39 -04:00
Piotr Mitros
1c5945db9c Fixed bug with showing answers related to complex numbers 2012-03-29 14:46:53 -04:00
David Ormsbee
3d7acff666 removed junk file 2012-03-29 12:24:06 -04:00
Calen Pennington
93c689e2a8 Don't fail post-install script if link target doesn't exist 2012-03-29 11:40:03 -04:00
David Ormsbee
a54fcd9777 Merge pull request #5 from MITx/pmitros/name-change
Name and e-mail change functionality
2012-03-29 08:12:12 -07:00
Kyle Fiedler
162fa59441 Merge branch 'master' into pmitros/name-change
Conflicts:
	static/css/application.css
	static/css/marketing.css
2012-03-29 11:08:41 -04:00
Kyle Fiedler
393044fba9 cleaned up some css 2012-03-29 10:45:52 -04:00
David Ormsbee
dbb4ff18b0 minor user message changes 2012-03-29 10:44:06 -04:00
David Ormsbee
17e84aaed1 Merge pull request #9 from MITx/pmitros/complex-numbers-fix
Complex numbers now work in problems
2012-03-29 07:08:59 -07:00
Piotr Mitros
37452f3a58 Moved from type to isinstance
* Parallel and exponentials in calc were broken because of this. Confirmed working
* Added test cases for the above
* Fixed a broken test case
2012-03-29 09:43:45 -04:00
David Ormsbee
bc604fca34 disabled mail_admins handler for error messages 2012-03-29 09:29:47 -04:00
Piotr Mitros
686b1bf6bd Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates 2012-03-28 19:44:22 -04:00
Piotr Mitros
eeffa7a6d2 http to https in confirmation e-mails 2012-03-28 17:50:51 -04:00
Piotr Mitros
9a7c0451ab Better logging. Tested and fixed bugs in previous commits 2012-03-28 17:45:43 -04:00
Piotr Mitros
25ca62d952 Proper e-mail address validation 2012-03-28 17:20:35 -04:00
Piotr Mitros
adf483a96b type converted to isinstance 2012-03-28 17:11:14 -04:00
Kyle Fiedler
7d3caf58e2 Fixed buttons for most sequnces 2012-03-28 15:48:30 -04:00
Kyle Fiedler
b288ec50f3 Fixed bug with the calculator 2012-03-28 15:09:05 -04:00
Kyle Fiedler
230ea1e650 Added fix for sequence nav bug 2012-03-28 14:56:32 -04:00
Piotr Mitros
f6787bd8be Minor word smithing 2012-03-28 14:53:35 -04:00
Piotr Mitros
59dfb2cfd4 Complex numbers now work in problems 2012-03-28 14:42:02 -04:00
Calen Pennington
9f379395b5 Fix issue with publish step not finding the .deb file 2012-03-28 13:52:44 -04:00
Calen Pennington
7199f96891 Use shorter commit hashes, and put the build number in the .deb name 2012-03-28 13:46:01 -04:00
Calen Pennington
c61c642577 Add a publish task that pushes rpms to gp 2012-03-28 10:43:22 -04:00
Kyle Fiedler
d3771b16a8 Removed deactive and unenroll 2012-03-27 13:59:24 -04:00
Kyle Fiedler
e99e5b3679 Added the highlight back to the updates 2012-03-27 13:54:49 -04:00
David Ormsbee
469a429c2a Merge pull request #7 from MITx/bridger-grades
Bridger grades
2012-03-27 09:59:19 -07:00
pmitros
5cecd0acbb Merge pull request #8 from MITx/textline_size
Input size now works
2012-03-27 06:58:18 -07:00
Lyla Fischer
75f5a1cfee failed to actually test and find the missing colon 2012-03-27 09:51:27 -04:00
Lyla Fischer
64e187fdd4 fixed default handling 2012-03-27 09:44:27 -04:00
Lyla Fischer
ce5540b234 textine size addition 2012-03-27 09:35:22 -04:00
Calen Pennington
79476eca6e Add a post-install script that points the link to the correct revision 2012-03-26 15:05:29 -04:00
Bridger Maxwell
e0e8e1e5e6 Fixes from pull request comments. Added Score namedtuple. 2012-03-26 09:38:58 -07:00
Calen Pennington
e5dba8c95e Ignore the build directory 2012-03-26 10:18:15 -04:00
Calen Pennington
ba148ee54f Make sure the installed repo is in the right location 2012-03-26 10:17:55 -04:00
Calen Pennington
54eb8e4e87 Exclude .pyc files from the deployed data 2012-03-26 10:17:18 -04:00
Bridger Maxwell
d809b68b2c Fixed slight difference between master branch 2012-03-25 15:11:46 -04:00
Bridger Maxwell
2f15424acc Merged in master branch 2012-03-25 15:05:37 -04:00