Commit Graph

Select branches

Hide Pull Requests

2022.05-rc

develop

stable

Mono Color

• 6e5471def3 Rename to singular Adam Magness 2017-12-04 09:01:27 -05:00
• 2f0da29c75 Features to src Adam Magness 2017-12-04 08:33:49 -05:00
• 2685c9bb1c Merge pull request #4003 from MrPetovan/task/3942-move-user-to-src Michael Vogel 2017-12-04 10:32:45 +01:00
• 370cf6bd91 Merge pull request #4004 from annando/vitality-check Hypolite Petovan 2017-12-04 02:45:45 -05:00
• ad8c290c2b Improved vitality check for followers, feeds and OStatus contacts Michael 2017-12-04 06:54:08 +00:00
• 85f6d6b7ed Remove include/user Hypolite Petovan 2017-12-03 22:29:13 -05:00
• 27212c7f39 Update function calls to use Model\User and Object\Contact Hypolite Petovan 2017-12-03 22:29:06 -05:00
• b0dcfc2724 Add class methods derived from include/user functions Hypolite Petovan 2017-12-03 22:27:49 -05:00
• 4395c20679 Fix formatting and add documentation Hypolite Petovan 2017-12-03 22:15:31 -05:00
• f41c891a6b Merge pull request #4002 from annando/onepoll Hypolite Petovan 2017-12-03 08:57:43 -05:00
• ae1227c9ca Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change Michael Vogel 2017-12-03 14:49:10 +01:00
• f988ed5d15 Merge remote-tracking branch 'upstream/develop' into onepoll Michael 2017-12-03 13:45:48 +00:00
• 239a0d70ad Merge pull request #3996 from annando/no-zot Hypolite Petovan 2017-12-03 08:40:29 -05:00
• 1eb8355ac8 Fix wrong condition Hypolite Petovan 2017-12-03 08:37:01 -05:00
• 3359f3f5c7 Fix formatting in mod/settings Hypolite Petovan 2017-12-03 08:36:39 -05:00
• df89e0384d Added description to networks, renaming some network names Michael 2017-12-03 13:26:52 +00:00
• 168c374029 Merge pull request #4000 from hoergen/develop Michael Vogel 2017-12-03 14:16:39 +01:00
• 0b752324b5 plusminus - removed blockquote borders, adjusted font size on several elements and classes hoergen 2017-12-03 13:39:56 +01:00
• e4ac2ff429 Merge pull request #3998 from tobiasd/20171203-install Michael Vogel 2017-12-03 10:31:12 +01:00
• ffd04fed85 missing word Tobias Diekershoff 2017-12-03 10:26:26 +01:00
• 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well Michael 2017-12-03 09:19:58 +00:00
• cd55c742e8 Check Diaspora contacts, don't poll unreachable contacts too often Michael 2017-12-03 08:59:24 +00:00
• b6b36d49da Merge pull request #3997 from tobiasd/20171203-admin Michael Vogel 2017-12-03 09:23:58 +01:00
• 2aca406f52 wrong URL in directory Tobias Diekershoff 2017-12-03 08:27:15 +01:00
• adf802474b Zot was never really supported, so it is now removed completely Michael 2017-12-02 21:57:39 +00:00
• 2ca03acb45 Merge pull request #3986 from MrPetovan/task/admin-block-list Michael Vogel 2017-12-02 22:09:04 +01:00
• 74973d1ae0 Merge pull request #3994 from zeroadam/Salmon-#3878 Hypolite Petovan 2017-12-02 10:21:08 -05:00
• 2b121779a6 Salmon move to src Adam Magness 2017-12-02 09:32:45 -05:00
• 7bd0ab8360 Move includes around in global_community_block Hypolite Petovan 2017-12-02 08:43:13 -05:00
• 4d10f3b3b7 Remove unused use statement Hypolite Petovan 2017-12-02 08:42:44 -05:00
• b5d24b5ac3 Merge pull request #3993 from zeroadam/Email-#3878 Michael Vogel 2017-12-02 13:03:43 +01:00
• 53e0dc7f87 Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2017-12-02 12:57:27 +07:00
• 75181322ba Improve page contacblock for frio theme Hypolite Petovan 2017-12-01 22:33:04 -05:00
• 8826ece55e Use Contact::getIdForURL instead of probing Hypolite Petovan 2017-12-01 22:32:24 -05:00
• 843ec842c3 Merge branch 'develop' into task/admin-block-list Hypolite Petovan 2017-12-01 21:39:20 -05:00
• 9a4e741d1a Review Changes Adam Magness 2017-12-01 21:05:06 -05:00
• 558f9d263d Merge pull request #3992 from zeroadam/Photo-hotfix Hypolite Petovan 2017-12-01 19:07:29 -05:00
• 508ce4a5be Use Exception Adam Magness 2017-12-01 18:47:52 -05:00
• e90b0748aa Code Cleanup Adam Magness 2017-12-01 18:13:39 -05:00
• f21feb975d Require Cleanup Adam Magness 2017-12-01 14:57:13 -05:00
• 6008e3df11 Email to src Adam Magness 2017-12-01 14:41:27 -05:00
• de4a2e6fd0 Merge pull request #3991 from MrPetovan/bug/undefined-variables Michael Vogel 2017-12-01 15:10:29 +01:00
• 58ac3532b7 Fix undefined variables messages Hypolite Petovan 2017-12-01 08:32:21 -05:00
• c9c103bdd7 Merge pull request #3987 from friendica/fabrixxm-patch-1 Tobias Diekershoff 2017-12-01 10:14:15 +01:00
• 0b85169e10 Missing 'use' in scripts/dbstructure fabrixxm 2017-12-01 09:35:05 +01:00
• 7fe549b8d2 Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2017-12-01 13:16:59 +07:00
• 2fe80e051b Merge branch 'develop' into task/admin-block-list Hypolite Petovan 2017-12-01 00:51:02 -05:00
• ff459441cf Merge branch 'develop' into task/admin-block-list Hypolite Petovan 2017-12-01 00:48:13 -05:00
• dc09319695 Add admin/contactblock page Hypolite Petovan 2017-12-01 00:43:39 -05:00
• 5fd4086fdc Add block/unblock methods to Contact class Hypolite Petovan 2017-12-01 00:41:26 -05:00
• 16d0c30328 Move admin templates to dedicated sub-folder Hypolite Petovan 2017-12-01 00:40:55 -05:00
• 052ba729d7 Improved translation functions Hypolite Petovan 2017-12-01 00:35:40 -05:00
• 84418860bd Improve dba Hypolite Petovan 2017-12-01 00:34:54 -05:00
• 0ae6f571da Merge pull request #3982 from zeroadam/Photo-#3878 Hypolite Petovan 2017-11-30 20:33:48 -05:00
• d04d2cb838 Static Adam Magness 2017-11-30 13:51:04 -05:00
• cddadb4b17 Object error Adam Magness 2017-11-30 07:48:47 -05:00
• 00ad255540 Replace function Adam Magness 2017-11-30 07:40:20 -05:00
• a21f6135fc Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2017-11-30 14:01:18 +07:00
• 3cebdee867 Fix mod/admin.php formatting Hypolite Petovan 2017-11-29 20:28:30 -05:00
• a5e9117524 Merge pull request #3985 from hoergen/develop Hypolite Petovan 2017-11-29 18:59:58 -05:00
• 7938decff3 Private to public Adam Magness 2017-11-29 18:37:32 -05:00
• 346820990c added some styles and removed typos hoergen 2017-11-30 00:13:16 +01:00
• 0373056448 Review and Use statements Adam Magness 2017-11-29 17:29:11 -05:00
• 93e6f5da47 Merge pull request #3984 from annando/best_link_url Hypolite Petovan 2017-11-29 16:39:14 -05:00
• 0982b0413b Bugfix for "Call to undefined function best_link_url()" Michael 2017-11-29 21:27:39 +00:00
• d42fe4bf5a Merge pull request #3983 from annando/nogroup Hypolite Petovan 2017-11-29 16:07:27 -05:00
• fe348acb49 Small fixes to "nogroup" Michael 2017-11-29 20:59:06 +00:00
• eb148cad55 Missed use dba Adam Magness 2017-11-29 13:04:58 -05:00
• 0091d318e5 Function names Adam Magness 2017-11-29 12:17:12 -05:00
• 775705acb9 Merge pull request #3981 from hoergen/develop Hypolite Petovan 2017-11-29 11:52:46 -05:00
• 52625653d3 removed tabsi, removed some blank lines. hoergen 2017-11-29 17:43:09 +01:00
• a926c8ce4c added some more minimalism, added annotations, removed some blank lines hoergen 2017-11-29 17:12:25 +01:00
• 54827e7fed Photo to src Adam Magness 2017-11-29 07:52:27 -05:00
• 7b5a0fdbe0 Merge pull request #3978 from annando/always-threads Tobias Diekershoff 2017-11-28 20:19:18 +01:00
• 8bffee43b3 Threads are now always enabled. Michael 2017-11-28 18:54:39 +00:00
• 3e2888b8d8 Merge pull request #3977 from tobiasd/20171128-docde Michael Vogel 2017-11-28 19:28:50 +01:00
• 9f845b0279 Events doc is not in DE, but had a from link to the doc home page Tobias Diekershoff 2017-11-28 14:29:50 +01:00
• e8bac99728 Merge pull request #3976 from rabuzarus/20171126_-_acl_forum Michael Vogel 2017-11-28 07:33:46 +01:00
• f5715cece9 acl: only one forum account should be selectable rabuzarus 2017-11-28 01:08:03 +01:00
• 16fb014547 Hotfix missing use dba Hypolite Petovan 2017-11-27 14:03:47 -05:00
• de3fcb0065 Merge pull request #3974 from tobiasd/20171127-credits Hypolite Petovan 2017-11-27 13:28:28 -05:00
• f983712269 Merge pull request #3973 from tobiasd/20171127-utilconfig Hypolite Petovan 2017-11-27 13:28:06 -05:00
• 0f086d22ac Merge pull request #3975 from tobiasd/20171127-tagcloud Hypolite Petovan 2017-11-27 13:22:32 -05:00
• 7eee227698 missing false for the tagcloud settings Tobias Diekershoff 2017-11-27 19:20:43 +01:00
• 6f825c5db4 regen credits Tobias Diekershoff 2017-11-27 18:42:05 +01:00
• 25c8db1625 config tool needed some touch up to work again Tobias Diekershoff 2017-11-27 18:27:57 +01:00
• 3f448d9a42 Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate Michael Vogel 2017-11-27 15:14:36 +01:00
• ced1063a10 Improved dba calls Hypolite Petovan 2017-11-27 08:17:56 -05:00
• 3dc7b131fc Merge pull request #3972 from tobiasd/20171127-messages Michael Vogel 2017-11-27 10:28:13 +01:00
• 67f75a3261 regenerated master messages.po file Tobias Diekershoff 2017-11-27 09:26:44 +01:00
• a2f1414a80 Merge pull request #3971 from annando/no_template_escape Tobias Diekershoff 2017-11-27 07:49:55 +01:00
• 9612496e9e The function "template_escape" doesn't exist anymore. Michael 2017-11-27 06:44:49 +00:00
• 88a9e4a904 Merge pull request #3969 from annando/bugfix-picture-forum Hypolite Petovan 2017-11-26 17:47:14 -05:00
• b65247a251 Merge pull request #3968 from hoergen/develop Hypolite Petovan 2017-11-26 17:46:43 -05:00
• a6de1a1ae8 Posting images to public forums now really does work. Michael 2017-11-26 22:28:46 +00:00
• c32b6000cb removed blank lines hoergen 2017-11-26 21:56:39 +01:00
• 9ddb81ce5f Fix function name typo Hypolite Petovan 2017-11-26 15:51:07 -05:00
• 2a60146a43 Revert "Add new legacy password field" Hypolite Petovan 2017-11-26 15:45:59 -05:00
• 456dfbe486 Forgotten change in src/Worker/Queue.php Hypolite Petovan 2017-11-26 14:56:50 -05:00
• 2196a0577b Remove unused upubkey and uprvkey from queries Hypolite Petovan 2017-11-26 14:55:47 -05:00