Commit graph

22741 commits

Author SHA1 Message Date
zotlabs
9fef13d6e6 use the linked item id for the photo object id instead of the photo uri. Otherwise we won't find it in the item table if we get that object as a replyTo. 2018-08-22 20:21:42 -07:00
zotlabs
73c25abb75 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-22 18:46:48 -07:00
zotlabs
0896061e89 better handling for calendar events 2018-08-22 18:45:53 -07:00
zotlabs
4fc688cfea Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-22 17:54:24 -07:00
zotlabs
9ce94bd414 product name 2018-08-22 17:53:17 -07:00
zotlabs
d55e5bbe75 typos and photo fixes 2018-08-22 17:52:22 -07:00
zotlabs
70f23fe9b2 Merge branch 'zap' 2018-08-22 16:43:42 -07:00
zotlabs
6ecd31a715 tweak archive widget for articles 2018-08-22 13:30:16 -07:00
Max Kostikov
456bc2ef86 Update hstrings.php 2018-08-22 15:13:01 +02:00
Max Kostikov
e071cd4635 Update hmessages.po 2018-08-22 15:12:09 +02:00
Mario Vavti
cc03e1ceef Merge remote-tracking branch 'mike/master' into dev 2018-08-22 10:47:40 +02:00
Mario
e4d08fc5d7 Merge branch 'redbasic-addroomforfooter' into 'dev'
Fix jumpy sidebars

See merge request hubzilla/core!1261
2018-08-22 10:46:02 +02:00
zotlabs
decd86fc08 fix profile like images and remove export button 2018-08-21 23:42:51 -07:00
zotlabs
b25192332b profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class 2018-08-21 23:39:49 -07:00
zotlabs
0eeaf8713f add api_not_found hook 2018-08-21 23:13:54 -07:00
zotlabs
42c4a0da51 Zot/Finger: ignore deleted hublocs 2018-08-21 21:38:10 -07:00
M.Dent
79eb6d3942 Fix jumpy sidebars 2018-08-21 13:18:42 -04:00
Mario Vavti
db853134e3 Merge remote-tracking branch 'mike/master' into dev 2018-08-21 13:19:30 +02:00
Mario
218029ee57 Merge branch 'redbasic-addroomforfooter' into 'dev'
Add bottom margin on aside elements and main to allow for viewport footer.

See merge request hubzilla/core!1259
2018-08-21 13:17:14 +02:00
Mario
0985adb770 Merge branch 'dev' into 'dev'
Update catalan translations for sstrings up to 18th July 2018

See merge request hubzilla/core!1260
2018-08-21 13:13:48 +02:00
Mario
5d2ac10073 Merge branch 'patch-17' into 'master'
Add missed app 'Order Apps'

See merge request hubzilla/core!1258

(cherry picked from commit 85aa4957414c98fb6f44c0c2b79ef9d198e963a7)

6086a70e Add missed app 'Order Apps'
2018-08-21 13:13:23 +02:00
zotlabs
9f979cab89 Merge branch 'zap' 2018-08-20 22:26:00 -07:00
zotlabs
bc06233d10 Merge branch 'red' 2018-08-20 22:24:44 -07:00
zotlabs
8bf1e3a944 more code optimisation 2018-08-20 22:02:08 -07:00
zotlabs
066febdf40 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-08-20 20:20:57 -07:00
zotlabs
9b620b2a35 remove checkjs reloader from mod_display also 2018-08-20 20:07:54 -07:00
zotlabs
a9bbfe9c4f Only show cover photos once per login session. After that they can get annoying. If there is pushback on this, then it should perhaps be optional. 2018-08-20 17:38:38 -07:00
zotlabs
d95735deaf channel page performance improvement: don't use "checkjs" with an associated page reload. Wrap a static copy of the content in noscript tags instead. 2018-08-20 17:22:49 -07:00
fadelkon
af31bbeba1 Update catalan translations for sstrings up to 18th July 2018 2018-08-20 22:50:46 +02:00
M.Dent
1d7d604016 Add bottom margin on aside elements and main to allow for viewport footer. 2018-08-20 00:15:34 -04:00
zotlabs
791bc9d805 Merge branch 'zap' 2018-08-19 20:42:26 -07:00
zotlabs
8f65d100e6 add ap_probe 2018-08-19 20:41:32 -07:00
zotlabs
c4328b9090 osada updates 2018-08-19 20:39:23 -07:00
zotlabs
4c1bfdfae8 implement Activity::store 2018-08-19 18:38:18 -07:00
zotlabs
df26fec1b3 hubzilla core issue #1262 2018-08-17 21:21:02 -07:00
zotlabs
2c1f8d894e Merge branch 'zap' 2018-08-17 14:43:19 -07:00
zotlabs
57e75d9332 add affinity app and start some serious refactoring of mod_photos 2018-08-16 23:01:31 -07:00
zotlabs
e5529938ea Suppress duplicate info() messages. This was done long for notice(), but info() was overlooked at that time. 2018-08-16 12:35:57 -07:00
Mario Vavti
e25db4d1b5 Merge remote-tracking branch 'mike/master' into dev 2018-08-16 08:50:52 +02:00
zotlabs
32acb0ff01 missing files 2018-08-15 21:33:11 -07:00
zotlabs
64196dd2a7 article summaries and some other stuff 2018-08-15 18:56:18 -07:00
zotlabs
f230c07ba5 possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar 2018-08-15 17:00:37 -07:00
Mario Vavti
2becc3273a Merge remote-tracking branch 'mike/master' into dev 2018-08-15 13:21:12 +02:00
zotlabs
f4f610f1a3 more backporting for zot6 2018-08-14 18:19:34 -07:00
Mario Vavti
10c5b46e3b Merge remote-tracking branch 'mike/master' into dev 2018-08-14 13:04:37 +02:00
Mario
b503ef8761 Merge branch 'override-helpfiles' into 'dev'
Override helpfiles

See merge request hubzilla/core!1257
2018-08-14 13:03:26 +02:00
M. Dent
94393d27c8 Override helpfiles 2018-08-14 13:03:26 +02:00
zotlabs
12f4787b67 issue with mdpost addon and archive.org links which contain a full url as a path/query component 2018-08-13 23:11:10 -07:00
zotlabs
f15c1c4e54 hubloc DB changes needed for z6 2018-08-13 21:18:20 -07:00
zotlabs
c43ea27f7e install cleanup 2018-08-13 20:41:41 -07:00