Skip to content

Commit 69938b6

Browse files
author
Seth Vargo
committed
Merge branch 'master' of github.com:cmu-is-projects/quickeval
* 'master' of github.com:cmu-is-projects/quickeval: quickeval.org NOT .me
2 parents 68f713a + 47a604a commit 69938b6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

report/lib_DBClass.php.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625
</tr>
626626

627627
<tr>
628-
<td class="coverFile" colspan="4">&nbsp;<a href="#605">public static function start($dbs = 'quickeval.me', $dbp = 3306, $dbu = 'quickeval', $dbpass = 'bJtVdRccfJRUwG7e', $dbd = 'quickeval')</a></td>
628+
<td class="coverFile" colspan="4">&nbsp;<a href="#605">public static function start($dbs = 'quickeval.org', $dbp = 3306, $dbu = 'quickeval', $dbpass = 'bJtVdRccfJRUwG7e', $dbd = 'quickeval')</a></td>
629629
<td class="coverBar" align="center" width="100">
630630
<table border="0" cellspacing="0" cellpadding="1">
631631
<tr>

report/lib_Util_Gravatar.php.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</tr>
120120

121121
<tr>
122-
<td class="coverFile" colspan="4">&nbsp;<a href="#15">public static function getGravatarImageLocation($email, $size = 80, $default = 'http://dev.quickeval.me/images/default.png')</a></td>
122+
<td class="coverFile" colspan="4">&nbsp;<a href="#15">public static function getGravatarImageLocation($email, $size = 80, $default = 'http://dev.quickeval.org/images/default.png')</a></td>
123123
<td class="coverBar" align="center" width="100">
124124
<table border="0" cellspacing="0" cellpadding="1">
125125
<tr>
@@ -167,7 +167,7 @@
167167
<span class="lineNum" id="container12"><a name="12"></a><a href="#12" id="line12"> 12</a> </span> : * @return string the url of the gravatar
168168
<span class="lineNum" id="container13"><a name="13"></a><a href="#13" id="line13"> 13</a> </span> : * @author Ari Rubinstein
169169
<span class="lineNum" id="container14"><a name="14"></a><a href="#14" id="line14"> 14</a> </span> : **/
170-
<span class="lineNum" id="container15"><a name="15"></a><a href="#15" id="line15"> 15</a> </span> : public static function getGravatarImageLocation($email, $size=80, $default=&quot;http://dev.quickeval.me/images/default.png&quot;){
170+
<span class="lineNum" id="container15"><a name="15"></a><a href="#15" id="line15"> 15</a> </span> : public static function getGravatarImageLocation($email, $size=80, $default=&quot;http://dev.quickeval.org/images/default.png&quot;){
171171
<span class="lineNum" id="container16"><a name="16"></a><a href="#16" id="line16"> 16</a> </span><span class="lineCov"> 1 : return 'http://www.gravatar.com/avatar.php?gravatar_id='.md5(strtolower($email)).'&amp;default='.urlencode($default).'&amp;size='.$size;</span>
172172
<span class="lineNum" id="container17"><a name="17"></a><a href="#17" id="line17"> 17</a> </span><span class="lineDeadCode"> : } </span>
173173
<span class="lineNum" id="container18"><a name="18"></a><a href="#18" id="line18"> 18</a> </span> : }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<img src='<?php echo WEB_ROOT; ?>/images/email/graph.jpg' align='right' alt='Course Added' />
22

3-
Your professor, <?php echo $invitinguser->name(); ?> has added you to the course, <?php echo $course->name; ?>, in QuickEval.me.
3+
Your professor, <?php echo $invitinguser->name(); ?> has added you to the course, <?php echo $course->name; ?>, in quickeval.org.
44
<br /><br />

0 commit comments

Comments
 (0)