Commit Graph

1416 Commits

Author SHA1 Message Date
David Ormsbee
dbb4ff18b0 minor user message changes 2012-03-29 10:44:06 -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
f6787bd8be Minor word smithing 2012-03-28 14:53:35 -04:00
Kyle Fiedler
d3771b16a8 Removed deactive and unenroll 2012-03-27 13:59:24 -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
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
Piotr Mitros
8a13b8c45b Minor cleanup of auxilliary changes to models 2012-03-21 10:39:56 -04:00
Piotr Mitros
bb288663db Last commit missing -a 2012-03-21 10:10:49 -04:00
Piotr Mitros
7986c7547b Name and e-mail change functionality appears to work -- needs graphic design 2012-03-21 09:39:32 -04:00
Piotr Mitros
75c5c1ce74 Name changes work, but meta storage not tested 2012-03-20 22:27:30 -04:00
David Ormsbee
4758ed10b3 raise karma limits on certain actions, disable askbot-wiki 2012-03-20 17:32:52 -04:00
Calen Pennington
6a744c8283 Merge pull request #1 from MITx/kf-calculator
Added styles for new calc and updated bourbon
2012-03-20 11:47:38 -07:00
Kyle Fiedler
3fadf0e16c Added styles for new calc and updated bourbon 2012-03-20 14:11:25 -04:00
Piotr Mitros
2b173379e5 E-mail changes appear to work 2012-03-20 09:37:15 -04:00
Calen Pennington
f1aea3d5e7 Don't list all the contents of the tar file 2012-03-20 09:30:13 -04:00
Calen Pennington
d468e7c679 Make build commands verbose and fail-fast 2012-03-20 09:30:03 -04:00
Piotr Mitros
2e905dc70c More of e-mail change process works 2012-03-19 21:24:21 -04:00
Kyle Fiedler
a3eb345bb1 added fixes for info updates 2012-03-19 16:19:15 -04:00
Kyle Fiedler
9bd5fbab2d removed the sass cache 2012-03-19 14:51:39 -04:00
Calen Pennington
086b1bf08b Forcing bash for ci build 2012-03-19 13:15:25 -04:00
Calen Pennington
ca50fe027e Remove origin/ and replace '/' in branch names in tar file 2012-03-19 13:11:06 -04:00
Calen Pennington
7541737c15 Fix how the tar is built 2012-03-19 13:05:01 -04:00
Calen Pennington
faa34e2683 Make build script executable 2012-03-19 12:20:00 -04:00
Calen Pennington
8fe8bb6604 Adding folder for ci scripts, and initial script for packaging repo 2012-03-19 12:19:29 -04:00
Calen Pennington
71cc49184b Merge remote-tracking branch '3rdParty/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
a445c2cc2b Merge remote-tracking branch 'templates/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
8b620c32d5 Merge remote-tracking branch 'static/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
1457c21f41 Merge remote-tracking branch '3rdParty/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
7954f9d482 Merge remote-tracking branch 'templates/pmitros-name-change' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
6c9b8e727e Merge remote-tracking branch 'static/master' into pmitros-name-change 2012-03-19 11:10:48 -04:00
Calen Pennington
fdc5cd94a9 Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
522ee0584b Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
fc68777119 Fix up the symlinks to point to the right place 2012-03-19 11:10:44 -04:00
Calen Pennington
2f0b39189a Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
d094d8c1dd Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
317542ad19 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
816edd1904 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
6dc7fd6ea5 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
4f65c6e67a Remove file in 3rdParty 2012-03-19 11:10:43 -04:00
Calen Pennington
799816a31d Move to subdirectory in preparation for merge 2012-03-19 11:10:43 -04:00
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00
Piotr Mitros
0702a84587 Unknown changes/pre-git transition
--HG--
branch : pmitros-name-change
rename : activation_email.txt => emails/activation_email.txt
rename : activation_email_subject.txt => emails/activation_email_subject.txt
2012-03-19 09:26:16 -04:00
Piotr Mitros
9882b30c83 Unknown changes/pre-git transition
--HG--
branch : pmitros-name-change
2012-03-19 09:25:42 -04:00