Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.gitignore for the jquery-ui.css files as well... #85

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

.gitignore for the jquery-ui.css files as well... #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ab88cb
Adding an if/then filter for empty sql retrieval instances.
Jun 2, 2016
2c4e7fd
Fixing bad capitalization of file
Jun 2, 2016
c25c2d5
Merge branch 'demca-2' into demca
Jun 2, 2016
8fd177c
Adding css/jquery.css to .gitignore, the conversion of this file also…
Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
config/dbconnection.php
config/symbini.php
css/main.css
css/jquery-ui.css
css/speciesprofile.css
footer.php
header.php
leftmenu.php
.settings/org.eclipse.php.core.prefs
.settings/org.eclipse.php.core.prefs
7 changes: 4 additions & 3 deletions classes/OccurrenceEditorManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,9 +1648,10 @@ public function getExternalEditArr(){
'CONCAT_WS(", ",u.lastname,u.firstname) AS username, r.externaltimestamp, r.initialtimestamp '.
'FROM omoccurrevisions r LEFT JOIN users u ON r.uid = u.uid '.
'WHERE (r.occid = '.$this->occid.') ORDER BY r.initialtimestamp DESC ';
//echo '<div>'.$sql.'</div>';
echo '<div>'.$sql.'</div>';
$rs = $this->conn->query($sql);
while($r = $rs->fetch_object()){
echo '<div>' . print_r($rs) . '</div>';
while($r = $rs->fetch_object()){
$editor = $r->externaleditor;
if($r->username) $editor .= ' ('.$r->username.')';
$ts = $r->initialtimestamp;
Expand Down Expand Up @@ -1926,4 +1927,4 @@ private function cleanRawFragment($str){
return $newStr;
}
}
?>
?>
2 changes: 1 addition & 1 deletion content/lang/checklists/checklistadmin.en.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
------------------
*/

include_once('Checklist.en.php');
include_once('checklist.en.php');

$LANG['NAV_HOME'] = 'Home';
$LANG['CHECKADMIN'] = ' Checklist Administration';
Expand Down
4 changes: 2 additions & 2 deletions content/lang/checklists/checklistadmin.es.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
------------------
*/

include_once('Checklist.en.php');
include_once('checklist.en.php');

$LANG['NAV_HOME'] = 'Inicio';
$LANG['CHECKADMIN'] = ' Administraci&oacute;n de Listado de Comprobaci&oacute;n';
Expand Down Expand Up @@ -70,4 +70,4 @@
$LANG['DELETECHECK'] = 'Borrar Listado de Comprobaci&oacute;n';
$LANG['SUBMITCHANG'] = 'Someter Cambios';
$LANG['DELETETHISU'] = 'Borrar este usuario';
?>
?>