aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/admin.pngbin8449 -> 2852 bytes
-rw-r--r--app/bugreport.pngbin5394 -> 4478 bytes
-rw-r--r--app/chat.pngbin2194 -> 2544 bytes
-rw-r--r--app/directory.pngbin12024 -> 4895 bytes
-rw-r--r--app/events.pngbin11242 -> 4118 bytes
-rw-r--r--app/features.pngbin7152 -> 8542 bytes
-rw-r--r--app/help.pngbin6889 -> 6697 bytes
-rw-r--r--app/home.pngbin5172 -> 6347 bytes
-rw-r--r--app/invite.pngbin5166 -> 6227 bytes
-rw-r--r--app/lang.pngbin7556 -> 5163 bytes
-rw-r--r--app/mail.pngbin6623 -> 4875 bytes
-rw-r--r--app/manage.pngbin9585 -> 7355 bytes
-rw-r--r--app/mood.pngbin5137 -> 6384 bytes
-rw-r--r--app/photos.pngbin13693 -> 4080 bytes
-rw-r--r--app/poke.pngbin14377 -> 2610 bytes
-rw-r--r--app/post.pngbin2850 -> 4394 bytes
-rw-r--r--app/probe.pngbin10625 -> 7584 bytes
-rw-r--r--app/search.pngbin8544 -> 8354 bytes
-rw-r--r--app/settings.pngbin7626 -> 7958 bytes
-rw-r--r--app/storage.pngbin5191 -> 3194 bytes
-rw-r--r--app/suggest.pngbin2164 -> 7225 bytes
-rw-r--r--app/webpages.pngbin8678 -> 9092 bytes
-rw-r--r--mod/photos.php3
-rw-r--r--view/js/autocomplete.js3
24 files changed, 1 insertions, 5 deletions
diff --git a/app/admin.png b/app/admin.png
index f1954e52a..cde922e8e 100644
--- a/app/admin.png
+++ b/app/admin.png
Binary files differ
diff --git a/app/bugreport.png b/app/bugreport.png
index 64b6b7e9f..4b59da185 100644
--- a/app/bugreport.png
+++ b/app/bugreport.png
Binary files differ
diff --git a/app/chat.png b/app/chat.png
index aa03c75dd..9d3fdebd7 100644
--- a/app/chat.png
+++ b/app/chat.png
Binary files differ
diff --git a/app/directory.png b/app/directory.png
index 2df872d94..659f69051 100644
--- a/app/directory.png
+++ b/app/directory.png
Binary files differ
diff --git a/app/events.png b/app/events.png
index 411ee51f9..a5670fd1e 100644
--- a/app/events.png
+++ b/app/events.png
Binary files differ
diff --git a/app/features.png b/app/features.png
index cdccd19f7..5faf14bc3 100644
--- a/app/features.png
+++ b/app/features.png
Binary files differ
diff --git a/app/help.png b/app/help.png
index e1348231c..6b9b1ccb6 100644
--- a/app/help.png
+++ b/app/help.png
Binary files differ
diff --git a/app/home.png b/app/home.png
index 3f1b864fc..4b45f2a7a 100644
--- a/app/home.png
+++ b/app/home.png
Binary files differ
diff --git a/app/invite.png b/app/invite.png
index 1cd9ce254..dbc2cbbfa 100644
--- a/app/invite.png
+++ b/app/invite.png
Binary files differ
diff --git a/app/lang.png b/app/lang.png
index 4c0b9aad1..debffd1ae 100644
--- a/app/lang.png
+++ b/app/lang.png
Binary files differ
diff --git a/app/mail.png b/app/mail.png
index 74fbdb03e..bbd9f8449 100644
--- a/app/mail.png
+++ b/app/mail.png
Binary files differ
diff --git a/app/manage.png b/app/manage.png
index 4c4d13162..38a4dcbae 100644
--- a/app/manage.png
+++ b/app/manage.png
Binary files differ
diff --git a/app/mood.png b/app/mood.png
index 7df642b96..2a5c1aca6 100644
--- a/app/mood.png
+++ b/app/mood.png
Binary files differ
diff --git a/app/photos.png b/app/photos.png
index b4b2c519e..59b038288 100644
--- a/app/photos.png
+++ b/app/photos.png
Binary files differ
diff --git a/app/poke.png b/app/poke.png
index 1d264dd1b..9655d54ff 100644
--- a/app/poke.png
+++ b/app/poke.png
Binary files differ
diff --git a/app/post.png b/app/post.png
index 11d48e271..4a4355581 100644
--- a/app/post.png
+++ b/app/post.png
Binary files differ
diff --git a/app/probe.png b/app/probe.png
index 71a954bf8..21bd85cd9 100644
--- a/app/probe.png
+++ b/app/probe.png
Binary files differ
diff --git a/app/search.png b/app/search.png
index e483280ec..505d93c3f 100644
--- a/app/search.png
+++ b/app/search.png
Binary files differ
diff --git a/app/settings.png b/app/settings.png
index ff5d8e5d2..2ba11a79a 100644
--- a/app/settings.png
+++ b/app/settings.png
Binary files differ
diff --git a/app/storage.png b/app/storage.png
index c1f2df801..ad8b89f6a 100644
--- a/app/storage.png
+++ b/app/storage.png
Binary files differ
diff --git a/app/suggest.png b/app/suggest.png
index 6868da30f..ca9180528 100644
--- a/app/suggest.png
+++ b/app/suggest.png
Binary files differ
diff --git a/app/webpages.png b/app/webpages.png
index 460117bae..72a091831 100644
--- a/app/webpages.png
+++ b/app/webpages.png
Binary files differ
diff --git a/mod/photos.php b/mod/photos.php
index 7a9229cc4..f4e770ec0 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -697,13 +697,10 @@ function photos_content(&$a) {
$imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id']
. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
- $rel=("photo");
-
$photos[] = array(
'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4),
'link' => $imagelink,
- 'rel' => $rel,
'title' => t('View Photo'),
'src' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext,
'alt' => $imgalt_e,
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index ba71bb2f5..7c3145769 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -7,7 +7,6 @@ function mysearch(term, callback, backend_url) {
var postdata = {
start:0,
count:100,
- //search:term.substring(1),
search:term,
type:'c',
}
@@ -40,7 +39,7 @@ function replace(item) {
// Autocomplete contacts
contacts = {
- match: /(^|\s)(@!?)(\w{2,})$/,
+ match: /(^|\s)(@\!*)([^ \n]+)$/,
index: 3,
search: function(term, callback) { mysearch(term, callback, backend_url); },
replace: replace,