harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,488 Commits 6 Branches 36 Tags
ca8d252ad75306e6d3cd066d5c593e94de1dfbdd
Commit Graph

24488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti 752a9d904c DB update to fix wrong hubloc_url for activitypub hublocs 
(cherry picked from commit eb04dbc5ce)
 2018-06-08 09:41:35 +02:00
Mario Vavti a5b9fbaf00 github to framagit transition 
(cherry picked from commit 7bf1c5f27b)
 2018-06-08 09:05:27 +02:00
Mario Vavti 7bf1c5f27b github to framagit transition 2018-06-08 09:04:19 +02:00
zotlabs d841303c04 we probably don't need to delivery local items more than once 
(cherry picked from commit 139c39c2ce)
 2018-06-08 08:38:53 +02:00
zotlabs 5e5b9895df when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to. 
(cherry picked from commit 5d83469621)
 2018-06-08 08:37:36 +02:00
zotlabs ac8f798e56 don't show forums in forum widget if archived flag is set 
(cherry picked from commit 7c05500392)
 2018-06-08 08:37:13 +02:00
Manuel Jiménez Friaza 5c8ec5cce4 Initial translations in doc/es-es 
(cherry picked from commit ea8ff7037a)
 2018-06-08 08:36:19 +02:00
Mario Vavti 19e509d997 escape query string 
(cherry picked from commit b3928f3d2a)
 2018-06-08 08:33:38 +02:00
Mario Vavti 38b230a128 typo 
(cherry picked from commit b47fdd748f)
 2018-06-08 08:31:02 +02:00
Mario Vavti b47fdd748f typo 2018-06-08 08:30:22 +02:00
gia vec c69c7db4f7 Update developers.bb 
(cherry picked from commit 009ecb0ff4)
 2018-06-08 08:27:11 +02:00
gia vec de20d8f73a Update Developers.md 
(cherry picked from commit 68ffddafb1)
 2018-06-08 08:26:46 +02:00
Mario 5deecfea28 Merge branch 'master' into 'master' 
Master

See merge request hubzilla/core!1211
 2018-06-08 08:26:15 +02:00
Mario Vavti dfa48ba17c fixes for search_item.tpl 2018-06-07 23:24:36 +02:00
Mario Vavti b3928f3d2a escape query string 2018-06-07 22:45:07 +02:00
gia vec 009ecb0ff4 Update developers.bb 2018-06-07 22:13:18 +02:00
gia vec 68ffddafb1 Update Developers.md 2018-06-07 22:10:32 +02:00
Mario Vavti d3bc50e18d do not query for parents if $conv and $nouveau are set 2018-06-07 21:58:09 +02:00
zotlabs d3f741a8b6 update a number of links in the code 
(cherry picked from commit 2c7597066c)
 2018-06-07 14:19:31 +02:00
Mario Vavti ad4e8fd7f5 Merge remote-tracking branch 'mike/master' into dev 2018-06-07 14:00:18 +02:00
zotlabs 2c7597066c update a number of links in the code 2018-06-06 17:12:20 -07:00
zotlabs c06c2650e5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-06-06 16:49:07 -07:00
Mario Vavti 9d664df993 remove gravizot.de from directory fallback servers due to owners request 2018-06-06 22:14:10 +02:00
Mario Vavti 89ecc07eb0 update install instructions 2018-06-06 22:13:27 +02:00
Mario Vavti 9ffb10c0e6 update install instructions 2018-06-06 22:11:55 +02:00
Mario Vavti dd4b8529c2 Merge remote-tracking branch 'mike/master' into dev 2018-06-06 20:13:03 +02:00
Mario Vavti 5d1d6299cd add the pf argument to the forum notification links 2018-06-06 18:02:25 +02:00
Mario Vavti 4e1c32e610 remove gravizot.de from directory fallback servers due to owners request 2018-06-06 17:59:13 +02:00
zotlabs d6f98ab88e some work to make menus editable by visitors with webpage write permissions; this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality. 2018-06-05 21:12:42 -07:00
Mario Vavti 7188e719ef rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason. 2018-06-05 11:56:30 +02:00
Mario Vavti 2328dfc851 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-06-05 10:36:54 +02:00
Mario Vavti 30c00df4f3 Merge remote-tracking branch 'mike/master' into dev 2018-06-05 10:36:37 +02:00
zotlabs e1b85a361c photos not syncing properly if destination is a postgres site 2018-06-04 16:36:13 -07:00
git-marijus 915328d92a Merge pull request #1210 from mjfriaza/dev 
Initial Spanish translations in doc/es-es
 2018-06-04 16:00:29 +02:00
Mario Vavti 6019a34da2 be specific about the term type and do not sort the results 2018-06-04 15:54:18 +02:00
zotlabs 5a9e6c8a69 sort out some mismatched hovertips on the activity filter 2018-06-03 23:38:03 -07:00
zotlabs 57231a8807 wrong level 2018-06-03 23:16:40 -07:00
zotlabs dd9f7ef6e9 fix submenunavigation on activity filters 2018-06-03 23:14:01 -07:00
Mario Vavti 8b76b5a0a6 improve network cid query 2018-06-03 23:03:30 +02:00
Mario Vavti 3d3e7bafd5 distinct is needed or it can heavily impact pagination in certain situations (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance. 2018-06-03 17:31:50 +02:00
Mario Vavti a42ff1e6d4 missing $perm_sql 2018-06-03 13:27:06 +02:00
Manuel Jiménez Friaza ea8ff7037a Initial translations in doc/es-es 2018-06-03 12:29:27 +02:00
Mario Vavti 2438af1cb5 the pf argument is required here for some functionality in /network 2018-06-03 00:16:46 +02:00
Mario Vavti a32626e489 add the archived flag 2018-06-02 22:42:20 +02:00
Mario Vavti 3a9f149c80 Merge remote-tracking branch 'mike/master' into dev 2018-06-02 22:39:36 +02:00
Mario Vavti a0e4f7ddb1 respect the privacy group feature setting in nav 2018-06-02 22:26:08 +02:00
Mario Vavti 8189408190 finalize filters and forum notifications 2018-06-02 22:11:11 +02:00
Mario Vavti db0a3a7534 some more work on forum notifications 2018-06-02 15:39:38 +02:00
zotlabs 5f612521da Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-06-02 00:01:19 -07:00
Mario Vavti 53efd4e470 unread forum notifications - wip/unfinished 2018-06-01 23:22:52 +02:00