Commit Graph

23602 Commits

Author SHA1 Message Date
Mario Vavti
32384eaf07 merge Zotlabs/Widget/Wiki_pages.php from dev 2018-10-29 10:06:01 +01:00
Mario Vavti
7c2efa697c merge Zotlabs/Module/Photo.php from dev 2018-10-29 10:04:34 +01:00
Mario Vavti
e1df69dfcb Merge branch 'dev' 2018-10-29 07:43:40 +01:00
M.Dent
1241e778f9 Fix to set update time in pconfig on update 2018-10-28 17:30:22 -04:00
M.Dent
3ab0ef1902 Add timestamp and associated logic to pconfig 2018-10-28 17:23:31 -04:00
M.Dent
c7c35b8b5a DB Updates to prep for pconfig timestamps. 2018-10-28 17:20:29 -04:00
M. Dent
3d9b1fd343 Merge branch 'dev' into 'dev'
fix issues with forum handling in mod network and ping. also some code cleanup.

See merge request hubzilla/core!1354
2018-10-28 03:22:22 +01:00
Mario Vavti
96bed3a623 fix issues with forum handling in mod network and ping. also some code cleanup. 2018-10-27 22:34:18 +02:00
Mario Vavti
e72b0edce2 Merge remote-tracking branch 'mike/master' into dev 2018-10-27 13:50:30 +02:00
zotlabs
ae4aeb4b1e delivery chain linkage messed up if original post was edited 2018-10-26 13:00:26 -07:00
M. Dent
302abc2a60 Merge branch 'dev' into 'dev'
notifications: fix unseen forum count

See merge request hubzilla/core!1351
2018-10-26 17:10:10 +02:00
Mario Vavti
2b3cbc638b notifications: fix unseen forum count 2018-10-26 09:53:56 +02:00
Mario
3de055bf65 Merge branch 'dev' into 'dev'
New strings in Spanish translation

See merge request hubzilla/core!1349

(cherry picked from commit df449e7bfe)

802a7ff3 New strings in Spanish translation
2018-10-26 08:16:54 +02:00
Mario
df449e7bfe Merge branch 'dev' into 'dev'
New strings in Spanish translation

See merge request hubzilla/core!1349
2018-10-26 08:16:16 +02:00
Mario
6326a50d20 Merge branch 'patch-20181025a' into 'dev'
Add entropy to queue worker - and fix requeuing of expired tasks

See merge request hubzilla/core!1350
2018-10-26 08:15:11 +02:00
M.Dent
aef212ada9 Add entropy to queue worker - and fix requeuing of expired tasks 2018-10-25 10:12:03 -04:00
Manuel Jiménez Friaza
802a7ff3a8 New strings in Spanish translation 2018-10-25 11:37:06 +02:00
M. Dent
9cedc864c2 Merge branch 'dev' into 'dev'
Editor contact autocomplete performance & refine stream filter and forum notification behaviour (mostly for performance)

See merge request hubzilla/core!1348
2018-10-25 03:38:05 +02:00
Mario Vavti
ee804cd6b1 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-10-24 23:08:22 +02:00
Mario Vavti
25c7e64ded fix get on {1} 2018-10-24 23:06:32 +02:00
Mario Vavti
5c4fbbebe1 refine stream filter and forum notification behaviour (mostly for performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath. 2018-10-24 20:58:25 +02:00
Mario Vavti
615402ea83 wrong var 2018-10-24 20:34:15 +02:00
Mario
a0a72a9f6d Merge branch 'patch-19' into 'dev'
Convert non UTF-8 content on link embeding

See merge request hubzilla/core!1347
2018-10-24 20:26:32 +02:00
Mario Vavti
8b9acf750b autocomplete performance: this slightly changes the editor contact autocomplete behaviour. queries using *like* with a prepended % to the query string do not make use of indices. this is no big issue when we query abook but can get really slow when xchan table is involved. this commit changes the xchan table only queries to use the *str%* format. this means that the result set for channels we are not connected with will change in a way that xchan_name and xchan_addr will bematched only from the beginning of the name or address. this commit also changes textcomplete to only start the query after the 3rd character. the result set between 2 and 3 characters is mostly very different and only from 3 chars on there is a high possibility the channel we look for is already in the result. 2018-10-24 20:22:27 +02:00
Max Kostikov
24d68a7f09 Update Linkinfo.php 2018-10-24 10:28:18 +02:00
Max Kostikov
781eeff021 Update Linkinfo.php 2018-10-23 20:36:30 +02:00
Max Kostikov
3e6c2c6024 Update Linkinfo.php 2018-10-23 19:57:21 +02:00
Max Kostikov
f180558041 Convert non UTF-8 content on link embeding 2018-10-23 19:32:36 +02:00
zotlabs
506ea71302 for whatever reason there were two of these
(cherry picked from commit 7ed197f46b)
2018-10-23 13:23:18 +02:00
Mario Vavti
01e11e9043 Merge remote-tracking branch 'mike/master' into dev 2018-10-23 13:18:04 +02:00
zotlabs
7ed197f46b for whatever reason there were two of these 2018-10-22 17:12:36 -07:00
Mario Vavti
5c36eef039 textcomplete: return up to 100 items and look for for matches in the entire string (not just the beginning) when suggesting emojis 2018-10-22 15:36:02 +02:00
Mario Vavti
26e20f9999 add summary to bbcode autocomplete list 2018-10-22 14:04:09 +02:00
Mario Vavti
71195895ba update blueimp_upload to version 9.23 2018-10-22 09:45:20 +02:00
Mario
c7ebb4b009 version 3.8.1 2018-10-21 09:25:37 +02:00
Mario Vavti
c0cef8dd12 changelog for 3.8.1
(cherry picked from commit ea850e58d2)
2018-10-21 09:23:37 +02:00
Mario Vavti
ea850e58d2 changelog for 3.8.1 2018-10-21 09:22:42 +02:00
Mario Vavti
dcdd97a985 fix ellipsis for too long nav banner
(cherry picked from commit a61ce45a32)
2018-10-21 09:10:45 +02:00
Mario Vavti
a61ce45a32 fix ellipsis for too long nav banner 2018-10-21 09:10:02 +02:00
mike
1326c4e71e fix wrong value being used for menu_id
(cherry picked from commit fdb7c115a7)
2018-10-21 09:02:17 +02:00
Mario
ad5f3877f1 Merge branch 'edit-menu-contents-fix' into 'dev'
fix wrong value being used for menu_id

See merge request hubzilla/core!1345
2018-10-21 09:00:48 +02:00
zotlabs
9cbbc80f7a disable blueimp demo server
(cherry picked from commit 7c49f22702)
2018-10-21 08:49:43 +02:00
Mario Vavti
8a02e967d3 Merge remote-tracking branch 'mike/master' into dev 2018-10-21 08:42:37 +02:00
zotlabs
7c49f22702 disable blueimp demo server 2018-10-20 15:27:35 -07:00
mike
fdb7c115a7 fix wrong value being used for menu_id 2018-10-20 16:55:54 -04:00
Mario Vavti
fa9e9510e5 Merge branch '3.8RC' 2018-10-19 11:18:28 +02:00
Mario Vavti
06b3ad1071 version 3.8 2018-10-19 11:16:44 +02:00
Mario Vavti
d96a731e93 bump version 2018-10-19 11:14:20 +02:00
Mario Vavti
847ff77a81 optimize autoload
(cherry picked from commit 2583270774)
2018-10-19 11:13:33 +02:00
Mario Vavti
df746c7911 strings and bump apd versions to version 2
(cherry picked from commit 4aed866d69)
2018-10-19 11:12:33 +02:00