Commit Graph

Select branches

Hide Pull Requests

2022.05-rc

develop

stable

Mono Color

• 68bcb99d3a Merge pull request #3008 from annando/1612-probe-logging rabuzarus 2016-12-11 20:01:09 +01:00
• 0c99cee092 Some logging to detect possible problems with the probing Michael 2016-12-11 18:39:39 +00:00
• 5c04402448 String is no integer Michael 2016-12-11 17:37:12 +00:00
• 23a97465e5 Avoid SQL errors Michael 2016-12-11 07:09:48 +00:00
• 28cb2857eb Merge pull request #3006 from rabuzarus/20161210_-_frio_submit_fix Michael Vogel 2016-12-11 00:22:20 +01:00
• 7dcf44aa96 frio: delete unneeded button attributes in search forms rabuzarus 2016-12-10 21:25:40 +01:00
• c666c98559 Code bautification Michael 2016-12-10 12:28:49 +00:00
• 00c74a7d6d Some more ... Michael 2016-12-10 12:21:16 +00:00
• 5572bd0cf9 Redo the index changes for testing purposes Michael 2016-12-10 12:19:57 +00:00
• fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance Michael 2016-12-10 12:18:11 +00:00
• b43691cc4b Merge pull request #3004 from tobiasd/20161210-2932followup Michael Vogel 2016-12-10 08:02:19 +01:00
• 132477990d move that option up, as the admin panel has no control over it ATM Tobias Diekershoff 2016-12-10 07:16:16 +01:00
• 89caa18fe0 add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up Tobias Diekershoff 2016-12-10 07:05:35 +01:00
• ef29e03491 make vier also the default from the emergency htconfig file Tobias Diekershoff 2016-12-10 07:04:39 +01:00
• 5065def530 Merge pull request #3000 from tobiasd/20161208-convert Michael Vogel 2016-12-09 18:13:27 +01:00
• 6f3e91d4c0 Michael may keep the typo Tobias Diekershoff 2016-12-09 18:11:27 +01:00
• acae70b85f long tweets Tobias Diekershoff 2016-12-09 16:46:37 +01:00
• a564e31451 use %placeholder% instead of Friendica Tobias Diekershoff 2016-12-09 16:43:40 +01:00
• af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src Michael Vogel 2016-12-09 15:54:11 +01:00
• b010a7db0d Merge pull request #3003 from tobiasd/20161209-lang Michael Vogel 2016-12-09 15:53:20 +01:00
• e88e030c28 Merge pull request #3002 from tobiasd/20161209-docissues rabuzarus 2016-12-09 13:43:21 +01:00
• 3512c87e64 DE, ES update to the translation Tobias Diekershoff 2016-12-09 12:36:28 +01:00
• 8659a09e17 Merge pull request #3001 from annando/1612-store-gcontact Tobias Diekershoff 2016-12-09 11:42:28 +01:00
• 52b8474be7 in docs there was a wrong link to the issue tracker Tobias Diekershoff 2016-12-09 11:38:08 +01:00
• e12227c000 The gcontact-id and the object field can now be stored with item_post Michael 2016-12-09 09:57:02 +00:00
• 4059e58bbf Merge pull request #2990 from Hypolite/fix-diaspora-medium-link Tobias Diekershoff 2016-12-08 21:11:47 +01:00
• f9b0beff8d only convert tables in friendica DB Tobias Diekershoff 2016-12-08 20:29:06 +01:00
• cd354d3a57 Adding default protocols on missing config value for backward compatibility Hypolite Petovan 2016-12-07 23:18:10 -05:00
• 88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src Hypolite Petovan 2016-12-07 23:15:46 -05:00
• e29023dc8c Standards Hypolite Petovan 2016-12-07 23:11:53 -05:00
• a4959626ad Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content Tobias Diekershoff 2016-12-06 22:05:08 +01:00
• 9457d30751 Merge pull request #2994 from tobiasd/20161206-frontendworker Michael Vogel 2016-12-06 22:01:29 +01:00
• 71cfe6db94 show some of the worker options only when the worker process is active Tobias Diekershoff 2016-12-06 21:47:37 +01:00
• 7eb1743945 Revert "show some of the worker options only when the worker process is active" Tobias Diekershoff 2016-12-06 21:45:06 +01:00
• 339708463e show some of the worker options only when the worker process is active Tobias Diekershoff 2016-12-06 21:44:18 +01:00
• b65433c823 docu docs: some polishing rabuzarus 2016-12-06 15:03:57 +01:00
• 26e771d913 Merge pull request #2995 from rabuzarus/20161206_-_frio_nav_bar_link_change Tobias Diekershoff 2016-12-06 14:19:00 +01:00
• 11507440ae frio: change some link behavior of user menu in the nav bar rabuzarus 2016-12-06 14:11:22 +01:00
• ac5617c40c add frontend worker to the admin panel and regen master messages.po file Tobias Diekershoff 2016-12-06 08:44:59 +01:00
• aef2c7373c Formatting Hypolite Petovan 2016-12-05 22:48:02 -05:00
• d0cb8cdccf Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em> Hypolite Petovan 2016-12-05 22:47:52 -05:00
• 60b9203dd5 Add <br> for each carriage return Hypolite Petovan 2016-12-05 22:46:51 -05:00
• 2b75ad5e0a src and href attributes sanitization touchups Hypolite Petovan 2016-12-04 21:33:29 -05:00
• 5e20aed428 Revert adding a leading slash to redir links Hypolite Petovan 2016-12-04 21:31:28 -05:00
• a25910db84 Merge pull request #2989 from tobiasd/20161203-de Michael Vogel 2016-12-05 00:32:15 +01:00
• 9899c30d0f Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen Tobias Diekershoff 2016-12-04 17:49:15 +01:00
• acf2e42e24 Merge pull request #2992 from rabuzarus/20161204_-_fix_cache_call_in_identity.php Tobias Diekershoff 2016-12-04 17:48:46 +01:00
• 3d4e1176ec Bugfix: cached data doesn't need to get unserialized anymore rabuzarus 2016-12-04 15:15:23 +01:00
• 5ca93d0541 Bugfix: Fix full screen for embedded videos rabuzarus 2016-12-04 14:55:57 +01:00
• ce4a4f22aa a typo and two issues Tobias Diekershoff 2016-12-04 14:45:48 +01:00
• 166df0180b Improve diaspora2bb autolinker for URLs Hypolite Petovan 2016-12-03 22:04:13 -05:00
• 979fc6d38a Add protocol whitelist for href/src attributes Hypolite Petovan 2016-12-03 14:19:57 -05:00
• 47a370c5e3 Revert adding baseurl to private image URL Hypolite Petovan 2016-12-03 10:39:06 -05:00
• 0f2c27e041 Merge branch 'develop' into issue/missing-private-image-src Hypolite Petovan 2016-12-03 10:34:48 -05:00
• 7ecc0a063c Update DE translation THX Rabuzarus Tobias Diekershoff 2016-12-03 10:09:40 +01:00
• bdae456e5d Merge pull request #2988 from rabuzarus/20161202_-_embed_text_complete Tobias Diekershoff 2016-12-02 20:20:20 +01:00
• 7a9a1b3722 autocomplete: add [embed] tag to tag autocomplete and to docu docs rabuzarus 2016-12-02 19:39:35 +01:00
• e20e64390b Merge pull request #2986 from annando/1612-spool Tobias Diekershoff 2016-12-02 17:14:10 +01:00
• b904aaff11 Merge remote-tracking branch 'upstream/develop' into 1612-spool Michael 2016-12-02 09:54:34 +00:00
• 6619e0791d Much more standards Michael 2016-12-01 22:52:35 +00:00
• c97306e734 Standards ... Michael 2016-12-01 22:50:07 +00:00
• 13150c09a5 File was missing Michael 2016-12-01 21:11:52 +00:00
• 6845775ff9 Store spooled data Michael 2016-12-01 20:53:18 +00:00
• df8db7d90d Merge pull request #2985 from annando/1612-ping Tobias Diekershoff 2016-12-01 20:37:45 +01:00
• c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool Michael 2016-12-01 13:58:47 +00:00
• eff4ad2e0a Spool items that couldn't be stored Michael 2016-12-01 13:50:26 +00:00
• aea122cd20 Little improvements to the queries in ping.php Michael 2016-12-01 13:44:30 +00:00
• 9a3941cf6e themes richtext Tobias Diekershoff 2016-12-01 14:13:26 +01:00
• 6ef69ad2da Merge pull request #2983 from annando/issue-2915-2918 Tobias Diekershoff 2016-12-01 14:10:08 +01:00
• ec69a52361 some more changes Tobias Diekershoff 2016-12-01 10:08:09 +01:00
• 1fc35d5f44 Merge pull request #2979 from annando/issue-2772 Tobias Diekershoff 2016-12-01 08:51:04 +01:00
• ac954278a5 Merge pull request #2984 from annando/1611-frontend Tobias Diekershoff 2016-12-01 08:47:31 +01:00
• 57c95c93e1 The frontend worker is now working as a full replacement for the crontab. Michael 2016-11-30 19:24:58 +00:00
• 1f50dc368e Merge remote-tracking branch 'upstream/develop' into 1611-frontend Michael 2016-11-30 04:46:47 +00:00
• 63389ba23d Pending or blocked - that's the question ... Michael 2016-11-30 04:30:48 +00:00
• cc5eebd173 The frontend worker can now fork background processes Michael 2016-11-29 22:40:19 +00:00
• 624fabf884 Somehow the changes of pull request 2748 got vanished Michael 2016-11-29 20:25:27 +00:00
• d620c5d996 Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish Michael Vogel 2016-11-29 21:09:59 +01:00
• d49325d177 Disable richtext editor for frio - followup for #2938 Michael 2016-11-29 20:04:31 +00:00
• a208d2e72b dfrn_request: include the graphic of the connection process into the doxygen header rabuzarus 2016-11-29 19:57:30 +01:00
• efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing Michael Vogel 2016-11-29 19:38:31 +01:00
• fa8eb101d4 Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish Michael Vogel 2016-11-29 19:33:57 +01:00
• af3549fa01 The first check for "pending" isn't neccessary. Michael 2016-11-29 18:31:37 +00:00
• b2302f6290 Maybe we shouldn't count pending contacts Michael 2016-11-29 18:23:34 +00:00
• 4566ad81fd protocol.md - fix typo rabuzarus 2016-11-29 16:10:32 +01:00
• a68735b725 update contact request $ confirmation graphics rabuzarus 2016-11-29 16:00:07 +01:00
• 54f3867ebd dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries rabuzarus 2016-11-29 15:52:12 +01:00
• 250f978872 Merge pull request #2978 from annando/issue-2518 rabuzarus 2016-11-29 14:59:00 +01:00
• 86665d47a6 Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish Michael Vogel 2016-11-29 09:42:26 +01:00
• d55d500e35 Merge pull request #2975 from annando/1611-frontend-worker Tobias Diekershoff 2016-11-29 09:40:59 +01:00
• fd28ecaacc Pending contacts shouldn't be displayed in the sidebar Michael 2016-11-29 06:40:35 +00:00
• 0d223aa6f1 dfrn_request: added $blocked and $pending as variable to make code more understandable rabuzarus 2016-11-29 03:08:46 +01:00
• eede89f537 Some brackets added Michael 2016-11-28 22:18:37 +00:00
• 3a76a6766f Issue 2772: Pending contacts should now be displayed Michael 2016-11-28 22:11:13 +00:00
• e7ef34298a remove "blubb" Michael 2016-11-28 21:48:06 +00:00
• a38a5019d0 Issue 2518: Remove contact data in the background Michael 2016-11-28 21:44:04 +00:00
• 9894f7cea7 Merge pull request #2965 from tobiasd/20161122-cpActiveResponse Michael Vogel 2016-11-28 21:14:42 +01:00
• 0ef764b167 Merge pull request #2970 from Hypolite/improvement/ping-php-json Michael Vogel 2016-11-28 21:08:36 +01:00
• 37e8f6b442 Merge pull request #2973 from rabuzarus/berlin_parse_url Michael Vogel 2016-11-28 21:05:31 +01:00
• 6c0bc15ecb docu fix: insert line break rabuzarus 2016-11-28 20:18:28 +01:00