Commit Graph

  • 6504156508 add a switch to the Markdown parser for using hard line breaks (issue 3592) Tobias Diekershoff 2017-08-09 16:04:53 +02:00
  • a5e7f7bf70 We don't need an order. Michael 2017-08-09 07:57:33 +00:00
  • 64718b53d1 Works now Michael 2017-08-09 06:16:19 +00:00
  • 95679c470c Merge pull request #3619 from annando/dba-connect Tobias Diekershoff 2017-08-09 08:13:57 +02:00
  • b01ab3e64c DBA: Do a fallback to other db functions on problems Michael 2017-08-09 06:02:48 +00:00
  • ae8098eaf2 Config now works with the new database routines Michael 2017-08-09 05:53:07 +00:00
  • 4d77c8a90a Merge pull request #3618 from annando/mysqli-fix Tobias Diekershoff 2017-08-08 09:32:26 +02:00
  • c3e1f88d4b Quickfix for MYSQLi (prepared statement problem) Michael 2017-08-08 06:07:04 +00:00
  • 56de36574b Merge pull request #3617 from ddorian1/develop Michael Vogel 2017-08-05 15:42:29 +02:00
  • 37262c24d9 Catch exceptions in PDO constructor Johannes Schwab 2017-08-04 11:01:29 +02:00
  • 93fb98959a Merge pull request #3613 from annando/some-ostatus Tobias Diekershoff 2017-08-03 08:01:04 +02:00
  • b7fb43484e Merge pull request #3614 from annando/avoid-warnings Tobias Diekershoff 2017-08-03 07:58:16 +02:00
  • c0d2e73d0a Merge pull request #3612 from tobiasd/20170802-issue2121 Michael Vogel 2017-08-03 07:54:35 +02:00
  • 1bd85971a4 Avoid some PHP warnings, no functional changes Michael 2017-08-03 05:50:44 +00:00
  • a80329b416 Speed up of OStatus transmission/Ignoring "created" with remote self Michael 2017-08-03 05:42:44 +00:00
  • ee6956a91a else is sufficient here Tobias Diekershoff 2017-08-03 07:23:05 +02:00
  • 0c8c69371c no global directory URL defined? Tobias Diekershoff 2017-08-03 07:22:29 +02:00
  • f94a360d9a Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase Michael Vogel 2017-08-02 19:45:37 +02:00
  • 5da5ab5c74 Merge pull request #3610 from rabuzarus/20170802_-_frio_subthread Tobias Diekershoff 2017-08-02 17:24:35 +02:00
  • ccb3f6b655 Add subthread to frio (needs reanabling the frio theme) rabuzarus 2017-08-02 15:52:11 +02:00
  • 28eb5d57a7 fix some method names (camelcase) in Probe.php and Lock.php rabuzarus 2017-08-02 13:09:42 +02:00
  • 6cf951c930 use /servers instead of /siteinfo for the directory link in invitations Tobias Diekershoff 2017-08-02 08:48:01 +02:00
  • 7034d6efbd use /servers instead of /siteinfo for the directory link in invitations Tobias Diekershoff 2017-08-02 08:47:09 +02:00
  • e38340dc5f Merge pull request #3608 from tobiasd/20170801-issue2998 Michael Vogel 2017-08-01 22:18:00 +02:00
  • 016e4a0efc Show contacts personal message in local profile Tobias Diekershoff 2017-08-01 17:47:13 +02:00
  • 8a93725d77 Merge pull request #3607 from annando/issue-3536 Tobias Diekershoff 2017-08-01 06:51:41 +02:00
  • 55569f9df3 This is a fix for issue 3536. Now likes aren't show anymore on the community page. Michael 2017-07-31 19:29:43 +00:00
  • 088837e1d1 Merge pull request #3606 from AndyHee/20170731-en_USGB_translations Tobias Diekershoff 2017-07-31 19:35:04 +02:00
  • fc3bb1ec70 Update US and GB Translations AndyHee 2017-07-31 21:18:22 +07:00
  • 390e34d587 Merge pull request #3605 from annando/better-endless-scroll Tobias Diekershoff 2017-07-31 11:09:45 +02:00
  • c98ae304c0 Endless scroll now avoids showing the same items Michael 2017-07-31 06:04:37 +00:00
  • 8cb4a8d0c4 Merge pull request #3604 from annando/bugfix-acl Tobias Diekershoff 2017-07-27 17:03:46 +02:00
  • 57b4ea4759 Bugfix: The ACL lookup had its problems after the last changes Michael 2017-07-27 14:02:25 +00:00
  • 83425a784b Merge pull request #3603 from annando/fix-ostatus Tobias Diekershoff 2017-07-26 07:27:37 +02:00
  • 955229e131 Fix incomplete webfinger data for OStatus Michael 2017-07-25 21:46:14 +00:00
  • f3f42ae3a2 Merge pull request #3602 from annando/1707-expiration Tobias Diekershoff 2017-07-23 22:21:30 +02:00
  • 95301fd58c Merge pull request #3600 from tobiasd/20170723-doc Michael Vogel 2017-07-23 22:07:06 +02:00
  • 11aa314f1b Merge pull request #3601 from tobiasd/20170723-credits Michael Vogel 2017-07-23 22:06:39 +02:00
  • b266d7d6ff Bugfix: the expiration check in item_store now works again Michael 2017-07-23 19:59:29 +00:00
  • b81499a7fc regen credits Tobias Diekershoff 2017-07-23 19:54:08 +02:00
  • 7d97171eec include the delete item page in the docs for the admin panel Tobias Diekershoff 2017-07-23 19:51:03 +02:00
  • 152eec4f2f Merge pull request #3597 from annando/1707-acl-separator Tobias Diekershoff 2017-07-23 10:27:40 +02:00
  • 2148a2bdb0 Merge pull request #3598 from annando/1707-expiration Tobias Diekershoff 2017-07-23 10:26:58 +02:00
  • 2e704d79eb In the acl there is now a separation between groups, forums and contacts Michael 2017-07-23 06:49:31 +00:00
  • 8d66909ba5 Check general expiration time at item storing as well Michael 2017-07-23 05:51:55 +00:00
  • dd0a1cf586 Merge pull request #3595 from annando/1707-realpath Tobias Diekershoff 2017-07-22 09:32:29 +02:00
  • 79fe249c54 Better use a wrapper Michael 2017-07-22 06:43:04 +00:00
  • 541dd9ec39 Merge pull request #3594 from annando/1707-realpath Tobias Diekershoff 2017-07-22 08:14:08 +02:00
  • 5d7e1e1a15 Use the realpath for the handling with (temporary) paths Michael 2017-07-22 05:50:25 +00:00
  • e854186134 Merge pull request #3591 from zotlabs/spammy_server_detection Michael Vogel 2017-07-21 19:37:11 +02:00
  • 0f67d82d05 Update socgraph.php Michael Vogel 2017-07-21 19:36:13 +02:00
  • a583bda5fc reduce the number of network fetches for server detection of hubzilla/red systems from around 10 to maybe 5. Kind of wasteful to get hit on 10 non-existent endpoints every couple of minutes. zotlabs 2017-07-19 17:56:40 -07:00
  • 6f661d50dc Merge pull request #3590 from annando/1707-bugfixes Tobias Diekershoff 2017-07-19 17:06:01 +02:00
  • 4a7ca0d44f Fix crash with expiration, false logger constant, no empty postings Michael 2017-07-19 05:51:39 +00:00
  • f71bd4f1f7 Merge pull request #3587 from annando/1706-ostatus-attach Tobias Diekershoff 2017-07-17 22:38:56 +02:00
  • a5baba84af Only show the attachment elements if there are one. Michael 2017-07-17 19:49:58 +00:00
  • 1c8e74edce Attachments now look fine. Michael 2017-07-17 19:38:15 +00:00
  • f65d6531ca Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach Michael 2017-07-15 10:36:56 +00:00
  • a58f9b3aaa Merge pull request #3585 from annando/bugfix-like-signature Tobias Diekershoff 2017-07-15 08:22:27 +02:00
  • 2bad626be6 Bugfix: Signatures for likes hadn't been stored Michael 2017-07-15 04:03:50 +00:00
  • b49a36f949 The attached image has now a class Michael 2017-07-15 04:02:12 +00:00
  • db0efc3fa8 Merge pull request #3584 from tobiasd/20170714-missingstring Michael Vogel 2017-07-14 22:48:27 +02:00
  • b5f58d317e there was a string not marked for translation Tobias Diekershoff 2017-07-14 15:21:08 +02:00
  • 181947f774 Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach Michael 2017-07-13 20:38:18 +00:00
  • 86934119b1 Merge pull request #3580 from annando/issue-3571-2 Tobias Diekershoff 2017-07-13 08:34:59 +02:00
  • 3334e0332d Merge pull request #3582 from annando/duplicate-error Tobias Diekershoff 2017-07-13 08:30:20 +02:00
  • e33a710d45 Merge pull request #3581 from annando/bugfix-markdown Tobias Diekershoff 2017-07-13 08:29:04 +02:00
  • 4c7a197f4b Avoid duplicate database errors when storing the conversations Michael 2017-07-13 06:00:53 +00:00
  • beaa911bac Bugfix: Some special characters weren't converted correctly Michael 2017-07-13 05:57:37 +00:00
  • 568abd537a Fixed error reporting Michael 2017-07-12 08:14:36 +00:00
  • cbca16de75 Merge pull request #3579 from tobiasd/20170712-de Michael Vogel 2017-07-12 08:29:10 +02:00
  • 8654b028ec DE translations Tobias Diekershoff 2017-07-12 08:26:26 +02:00
  • 69f20959ff Update existing contact records with data from probing Michael 2017-07-12 06:07:22 +00:00
  • a47e1e13d7 Process all data that we can fetch via probing Michael 2017-07-12 05:56:35 +00:00
  • a8db1282e2 Merge remote-tracking branch 'upstream/develop' into issue-3571-2 Michael 2017-07-12 05:41:58 +00:00
  • c54b7e84ab Merge pull request #3578 from annando/probe-warning Tobias Diekershoff 2017-07-12 07:21:31 +02:00
  • 35b3723c4a database logging now works for database errors Michael 2017-07-11 19:14:49 +00:00
  • 8ec7f1de56 Issue 3571: Reworked "get_contact" function Michael 2017-07-11 18:32:35 +00:00
  • 41ec057813 Avoid "Invalid argument" warning in probing. Michael 2017-07-11 17:34:38 +00:00
  • 81dedb3f92 Merge pull request #3577 from annando/2in1 Tobias Diekershoff 2017-07-11 08:31:39 +02:00
  • ee015a249e Merge pull request #3576 from tobiasd/20170710-messages Michael Vogel 2017-07-11 05:58:43 +02:00
  • 363322ba78 Issue 3571 and Diaspora mail bugfix Michael 2017-07-10 22:35:32 +00:00
  • e88a999a72 regenerated master messages.po file Tobias Diekershoff 2017-07-10 18:59:59 +02:00
  • 896bf4046c Merge pull request #3569 from tobiasd/20170702-delete Michael Vogel 2017-07-10 18:44:19 +02:00
  • ef3398f09a Merge pull request #3573 from irhen/issue-3529-fix-mega-age Michael Vogel 2017-07-10 18:43:05 +02:00
  • dc41ac0f61 use drop_item and some magic Tobias Diekershoff 2017-07-10 14:55:40 +02:00
  • c6137ca0df is empty check irhen 2017-07-10 14:17:06 +03:00
  • 6bbc1ac602 Merge pull request #3575 from annando/dfrn-update-copy Tobias Diekershoff 2017-07-09 10:17:22 +02:00
  • 5921fd03e5 Merge pull request #3574 from annando/further-expire-split Tobias Diekershoff 2017-07-09 10:15:34 +02:00
  • 9f92fddb00 DFRN: Update the public item copy as well Michael 2017-07-09 04:29:35 +00:00
  • 6b1b02472a Merge pull request #3570 from beardyunixer/boot Michael Vogel 2017-07-09 05:56:03 +02:00
  • 0092cdef44 Merge pull request #3572 from deantownsley/contactfix_basic Michael Vogel 2017-07-09 05:55:19 +02:00
  • af181941db Split the delete process into a separate expire process Michael 2017-07-09 03:37:20 +00:00
  • 534f79a5a5 fix big age irhen 2017-07-08 23:30:30 +03:00
  • 8863f0e234 Merge pull request #3554 from Alkarex/semaphore_warning Michael Vogel 2017-07-08 18:32:07 +02:00
  • 11c5f471af Fix/workaround weird load order issue. Thomas Willingham 2017-07-08 16:25:13 +01:00
  • 11d271f3c5 Only delete uid=0 entries when cleaning up extra public entries Dean Townsley 2017-07-08 09:55:40 -05:00
  • 080da4777d Use unset after unlock Alexandre Alapetite 2017-07-08 11:03:41 +02:00
  • d88584af69 Merge pull request #3567 from rjm6823/develop Tobias Diekershoff 2017-07-08 08:36:54 +02:00
  • 9304bb6422 Typos Tobias Diekershoff 2017-07-07 20:54:26 +02:00