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 |
|
Bridger Maxwell
|
2aca626440
|
Changed gradebook to be a table.
|
2012-03-24 15:32:11 -04:00 |
|
Calen Pennington
|
a8a4b49d0b
|
Correctly grab the build number from the environment when packaging
|
2012-03-23 14:35:36 -04:00 |
|
Calen Pennington
|
b5652552df
|
Switching to rake for build management
|
2012-03-23 14:30:05 -04:00 |
|
Reda Lemeden
|
8fe162a2b5
|
Merge pull request #3 from MITx/kf-calculator
Added some styles so that the hints for the calculator pop up
|
2012-03-22 14:05:58 -07:00 |
|
Kyle Fiedler
|
e81bc425cb
|
Added return false on clicks for calculator
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
3512df424e
|
Added image for info
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
813fc488c6
|
Spead up animation and added diferent wording
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
6627153e1c
|
Added styles for the calc hint
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
1be8d198ab
|
Added a fake deactivate and unenroll links and some style for profile
|
2012-03-22 15:32:31 -04:00 |
|
Calen Pennington
|
8c893ab384
|
Adding pip requirement files. Pre-requirements must be run first, because scipy needs numpy already installed when executing the scipy installer
|
2012-03-22 12:37:07 -04:00 |
|
Calen Pennington
|
009f951483
|
Don't execute the site-specific settings file if it doesn't exist
|
2012-03-22 12:37:07 -04:00 |
|
Calen Pennington
|
8593d45e90
|
Add dependencies to build .deb
|
2012-03-22 12:37:07 -04:00 |
|
Calen Pennington
|
1a248aabca
|
Switch to fpm to build installable package
|
2012-03-22 12:37:07 -04:00 |
|
Kyle Fiedler
|
84ac8a1d2a
|
Added some styles for name and email change
|
2012-03-21 17:06:37 -04:00 |
|
Piotr Mitros
|
edfff32338
|
Incorporated Dave's feedback
|
2012-03-21 14:19:36 -04:00 |
|
Piotr Mitros
|
399ea8e41e
|
Removed duplicates
|
2012-03-21 11:03:45 -04:00 |
|
Piotr Mitros
|
f2878b549c
|
Merge. Note duplicate e-mail subject files
|
2012-03-21 11:03:01 -04:00 |
|