Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 5a9e6c8a69 sort out some mismatched hovertips on the activity filter zotlabs 2018-06-03 23:38:03 -07:00
• 57231a8807 wrong level zotlabs 2018-06-03 23:16:40 -07:00
• dd9f7ef6e9 fix submenunavigation on activity filters zotlabs 2018-06-03 23:14:01 -07:00
• 8b76b5a0a6 improve network cid query Mario Vavti 2018-06-03 23:03:30 +02:00
• 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. Mario Vavti 2018-06-03 17:31:50 +02:00
• a42ff1e6d4 missing $perm_sql Mario Vavti 2018-06-03 13:27:06 +02:00
• ea8ff7037a Initial translations in doc/es-es Manuel Jiménez Friaza 2018-06-03 11:45:05 +02:00
• 2438af1cb5 the pf argument is required here for some functionality in /network Mario Vavti 2018-06-03 00:16:46 +02:00
• a32626e489 add the archived flag Mario Vavti 2018-06-02 22:42:20 +02:00
• 3a9f149c80 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-06-02 22:39:36 +02:00
• a0e4f7ddb1 respect the privacy group feature setting in nav Mario Vavti 2018-06-02 22:26:08 +02:00
• 8189408190 finalize filters and forum notifications Mario Vavti 2018-06-02 22:11:11 +02:00
• db0a3a7534 some more work on forum notifications Mario Vavti 2018-06-02 15:39:38 +02:00
• 5f612521da Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-06-02 00:01:19 -07:00
• 53efd4e470 unread forum notifications - wip/unfinished Mario Vavti 2018-06-01 23:22:52 +02:00
• 22a9e4c9a9 add manage privacy groups entry to the panel channel menu dropdown for now Mario Vavti 2018-06-01 21:52:54 +02:00
• 56f0244360 fixes for css fix Mario Vavti 2018-06-01 20:59:28 +02:00
• 60a7e68b1b css fix Mario Vavti 2018-06-01 13:39:29 +02:00
• ec6d4f8ac3 add hover effect to dropdown caret Mario Vavti 2018-06-01 13:30:02 +02:00
• a6ab3dd36a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-06-01 03:43:11 -07:00
• 6bf0f4225c move file and groups filter to submenu Mario Vavti 2018-06-01 12:11:07 +02:00
• 4df5d44ef9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-05-31 22:25:01 -07:00
• dd962027cc proper pronoun zotlabs 2018-05-31 21:14:12 -07:00
• 7c05500392 don't show forums in forum widget if archived flag is set zotlabs 2018-05-31 16:17:24 -07:00
• 5d83469621 when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to. zotlabs 2018-05-31 16:11:51 -07:00
• d03c27d18c implement reset button for filters Mario Vavti 2018-05-31 14:02:34 +02:00
• 7e8c7f86f0 change some strings Mario Vavti 2018-05-31 13:13:46 +02:00
• b438ffead4 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-05-31 13:06:33 +02:00
• cbaaa1c57f merge groups and filed posts into activity filters Mario Vavti 2018-05-31 13:05:32 +02:00
• f0690aadcc typo in unused function zotlabs 2018-05-30 23:40:01 -07:00
• fc31ecdab0 autocomplete private mail addresses based on substring in either the name or webbie (prevously required an '@' to trigger a webbie search) zotlabs 2018-05-30 17:30:17 -07:00
• 6bfc5aa96c strpos does not work with arrays :( Mario Vavti 2018-05-30 23:15:43 +02:00
• 5505f5fa02 restrict the network/channel navbar search to content and hashtags Mario Vavti 2018-05-30 22:55:28 +02:00
• 6349a7417f make navbar search use the module search function in /network and /channel Mario Vavti 2018-05-30 22:40:22 +02:00
• e1a55ba471 remove redundant css from default.css Mario Vavti 2018-05-30 20:18:13 +02:00
• 881406f82b remove redundant reference for order Mario Vavti 2018-05-30 14:54:39 +02:00
• 293e405f5b just query for data we actually need Mario Vavti 2018-05-30 14:09:24 +02:00
• 8d6441704b add widget files and templates Mario Vavti 2018-05-30 14:06:18 +02:00
• 9fcb3bf2e8 first cut on restructuring the previously called network tabs Mario Vavti 2018-05-30 14:02:58 +02:00
• 7d088c8d56 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-05-29 17:51:36 -07:00
• ed3d3b6f27 provide possibility of using different orderings (post, commented) on channel page zotlabs 2018-05-29 17:35:44 -07:00
• dcd5f00077 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-05-29 09:04:45 +02:00
• 4aa9549828 Some stuff of the Spanish Hubzilla Manuel Jiménez Friaza 2018-05-26 18:09:22 +02:00
• bca3113fba Merge pull request #1202 from aninf-wo/dev git-marijus 2018-05-29 08:41:31 +02:00
• a8a2c806f2 Merge pull request #1198 from mjfriaza/dev git-marijus 2018-05-29 08:41:00 +02:00
• e00c5c6bf1 Merge pull request #1197 from galettesaucisse/patch-52 git-marijus 2018-05-29 08:40:27 +02:00
• 7e8c895ccd Merge pull request #1196 from galettesaucisse/patch-51 git-marijus 2018-05-29 08:40:13 +02:00
• 139c39c2ce we probably don't need to delivery local items more than once zotlabs 2018-05-28 22:23:40 -07:00
• 6bae91dd7e Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-05-28 14:59:10 +02:00
• c115e8ee60 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-05-27 21:10:52 -07:00
• ddebbcc0a0 hubzilla issue #1200 zotlabs 2018-05-27 17:46:25 -07:00
• 4f3be92a0d include photos.php Herbert Thielen 2018-05-27 17:57:35 +02:00
• 9655b27f81 fix js error with catalan language (unescaped strings) Mario Vavti 2018-05-27 12:20:07 +02:00
• 5a475453ab fix js error with catalan language (unescaped strings) Mario Vavti 2018-05-27 12:20:07 +02:00
• eb04dbc5ce DB update to fix wrong hubloc_url for activitypub hublocs Mario Vavti 2018-05-26 21:15:22 +02:00
• 2bf76928cc Some stuff of the Spanish Hubzilla Manuel Jiménez Friaza 2018-05-26 18:09:22 +02:00
• 89d97c556a Update hstrings.php Galette Saucisse 2018-05-26 09:18:41 +02:00
• 4ff2b8ed1b Update hmessages.po Galette Saucisse 2018-05-26 09:17:04 +02:00
• ed17e8a649 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Andrew Manning 2018-05-25 20:07:31 -04:00
• 33700e9cf4 differentiate between direct messages and followers-only messages Mario Vavti 2018-05-25 15:29:59 +02:00
• 13b3594ff3 Merge pull request #1191 from jeroenpraat/master git-marijus 2018-05-25 12:37:11 +02:00
• eebeb450c3 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2018-05-25 12:34:59 +02:00
• 0fe449ba33 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2018-05-25 12:34:35 +02:00
• cd4454100b alternate fix for z_check_dns zotlabs 2018-05-24 16:32:21 -07:00
• fb060c27ef Finaly update of Dutch language strings Jeroen 2018-05-24 18:25:28 +02:00
• fcd9e115c2 Finaly an update of Dutch language strings Jeroen 2018-05-24 18:22:09 +02:00
• cf00a9dbfc Merge pull request #1190 from fadelkon/dev git-marijus 2018-05-24 11:55:47 +02:00
• bace238e9f Merge pull request #1183 from galettesaucisse/patch-50 git-marijus 2018-05-24 11:54:09 +02:00
• 7586bc9dcf Merge pull request #1182 from galettesaucisse/patch-49 git-marijus 2018-05-24 11:53:50 +02:00
• 7a294c3843 Update remote_friends_common.tpl antil0pa 2018-05-22 16:24:04 +02:00
• 2599d78d0c Merge pull request #1185 from antil0pa/patch-1 git-marijus 2018-05-24 11:49:35 +02:00
• fc6b337bbb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Andrew Manning 2018-05-24 05:35:50 -04:00
• ea17b46e94 Update catalan translation (both po and php) for sources changes up to Apr 23rd 2018, 07:35. fadelkon 2018-05-24 03:59:01 +02:00
• 9cf8931136 paint the locks on private activitypub items red. their privacy model is "slightly" different from ours Mario Vavti 2018-05-23 22:11:13 +02:00
• afb29176a4 deal with db failure gracefully zotlabs 2018-05-23 02:33:46 -07:00
• 1da0042ee5 Update remote_friends_common.tpl antil0pa 2018-05-22 16:24:04 +02:00
• 76d8e59e9b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-05-21 21:15:24 -07:00
• 1061027071 new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick zotlabs 2018-05-21 20:17:17 -07:00
• a403611ac9 update response types zotlabs 2018-05-21 19:34:03 -07:00
• 2b3f931c85 oauth2 discovery per draft-ietf-oauth-discovery-10 zotlabs 2018-05-21 19:25:03 -07:00
• 9bf26cee6d add hook 'get_system_apps' zotlabs 2018-05-21 16:19:17 -07:00
• d9066ef26b not null violation oauth1 zotlabs 2018-05-21 13:37:55 -07:00
• 4610fa2774 address globbing issue in #1170 Mario Vavti 2018-05-21 20:01:03 +02:00
• fff720c00d address globbing issue in #1170 Mario Vavti 2018-05-21 20:01:03 +02:00
• 7e26200510 Update gdpr1.md Galette Saucisse 2018-05-21 10:25:03 +02:00
• 1dbf89362f Update gdpr1.md Galette Saucisse 2018-05-21 10:22:19 +02:00
• cc1453a8de Update gdpr1.md Galette Saucisse 2018-05-21 10:16:39 +02:00
• a8def37dcf Create TermsOfService.md Galette Saucisse 2018-05-21 10:08:00 +02:00
• 355a9ac7ee Create gdpr1.md Galette Saucisse 2018-05-21 10:05:17 +02:00
• a8274bbfb3 missing permission description Mario Vavti 2018-05-21 09:25:57 +02:00
• 7dadbbbac7 bring jot reset to some more places Mario Vavti 2018-05-21 09:13:14 +02:00
• 49f7d63290 first cut at a general purpose gdpr document. What we would like to do is use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community. zotlabs 2018-05-20 23:40:10 -07:00
• 0044906fab Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2018-05-20 20:19:11 -07:00
• ac8706e919 pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint) zotlabs 2018-05-20 19:18:39 -07:00
• 5b48eb3657 update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 Mario 2018-05-20 22:42:47 +02:00
• 43f04e4bc0 improve abconfig queries Mario Vavti 2018-05-20 20:48:52 +02:00
• 649260ce44 more local_channel() is not string Mario Vavti 2018-05-20 14:15:46 +02:00
• f091a3c9fc local_channel() is not string Mario Vavti 2018-05-20 14:07:30 +02:00
• 18338495af do not update #acl-list-content on every click in jot. we just need this updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts. Mario Vavti 2018-05-20 11:12:39 +02:00
• a3f9cf7e97 update to fork-awesome 1.1 and fix an old font-awesome reference Mario Vavti 2018-05-19 22:01:10 +02:00