Commit Graph

  • b326ab78b3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-11-05 03:33:35 -07:00
  • 8811ca9e9e provide /locs link on settings page if there is more than one hubloc for this channnel *that isn't deleted*. zotlabs 2016-11-05 03:31:50 -07:00
  • 471d88c1d2 some fixes for the recent changes in the personal menu dropdown Mario Vavti 2016-11-04 21:29:23 +01:00
  • 4a738024cc Merge pull request #579 from anaqreon/ui zotlabs 2016-11-04 12:10:08 +11:00
  • 8ac32cf4d6 Collapse navbar-collapse-1 if avatar menu is clicked. Andrew Manning 2016-11-03 21:01:18 -04:00
  • b541351a0a ignore flags to dns_get_record() and look for anything zotlabs 2016-11-02 23:37:57 -07:00
  • 92f5a2b6a6 issue #409 - use item_notshown for file activities to prevent display but allow transmitting to other sites. We currently allow file acitivies with item_hidden to be transmitted as a special case but eventually we want to remove the special case and disallow items with item_hidden from being propagated. zotlabs 2016-11-02 21:17:18 -07:00
  • ae092efb49 provide merged usermenu div for all server roles zotlabs 2016-11-02 20:22:48 -07:00
  • 94065fde33 issue #576 - duplicate events shown zotlabs 2016-11-02 19:26:02 -07:00
  • aab7bc5282 silence a minor warning zotlabs 2016-11-02 18:48:23 -07:00
  • 9e2ccbd2a7 convert manual page updates to a display setting instead of a feature zotlabs 2016-11-02 18:40:50 -07:00
  • 6a6494d947 if connecting to a channel that is already pending, undo the pending and set connect permissions accordingly. issue #577 - this will mostly affect channels that were connected out of band, but will also auto-friend somebody that has already connected to you, if you reciprocate prior to seeing and/or acting on the pending connection notice. zotlabs 2016-11-02 17:27:18 -07:00
  • cb9e944de1 remove debugging zotlabs 2016-11-02 17:01:44 -07:00
  • 1f92c594c8 issue #575, when 'nofinish' is set on an event, invalid date was generated/stored zotlabs 2016-11-02 17:00:29 -07:00
  • f91031bd65 allow your own likes/comments to be updated when in static update mode zotlabs 2016-11-02 15:48:29 -07:00
  • 5d3e04216d Merge pull request #574 from zotlabs/static_update git-marijus 2016-11-02 16:12:05 +01:00
  • 055d55b71b retry liveupdate up to 10 times if we receive incomplete/truncated html data. zotlabs 2016-11-01 21:39:49 -07:00
  • ca948d66a9 feature: static page update as opposed to live update of conversations on the page. Changes will be queued until the page is reloaded. There may or may not be notifications of pending activity updates depending on your notification preferences. Endless scrolling (append) is still performed either way. This only affects changed and new/unseen items being inserted into the page. zotlabs 2016-11-01 20:21:39 -07:00
  • fa8cb40af0 Merge pull request #573 from phellmes/dev zotlabs 2016-11-02 12:15:17 +11:00
  • b13fb1cca9 command line connect utility. Usage: util/connect uid|nick channel zotlabs 2016-11-01 15:27:34 -07:00
  • 01b8ed97ed update DE translation strings phellmes 2016-11-01 16:38:16 +01:00
  • 863ee9e6dd bbcode event formatting issue zotlabs 2016-10-31 21:48:00 -07:00
  • 4ebd604ca9 provide plugin restrictions based on config settings zotlabs 2016-10-31 18:54:04 -07:00
  • 581ef6e18d string update zotlabs 2016-10-30 12:34:00 -07:00
  • 321a32050b improve the check in 9b42bc860 zotlabs 2016-10-30 12:33:30 -07:00
  • db6a207afe Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-10-30 15:54:46 +01:00
  • 9b42bc860d possible fix for https://zothub.de/display/2d4996dd629504851d Mario Vavti 2016-10-30 15:54:06 +01:00
  • 6174aa01e0 add embed bbcode to the autocomplete list Mario Vavti 2016-10-30 13:43:47 +01:00
  • fb7692cf9c fix https://zothub.de/display/9d9078d212862c5f58 Mario Vavti 2016-10-30 13:34:47 +01:00
  • 9279840860 fix https://zothub.de/display/9d9078d212862c5f58 Mario Vavti 2016-10-30 13:34:47 +01:00
  • 9c05f37c0f update setup and install documents for PDO and the freebsd issue with dns_get_record() zotlabs 2016-10-27 19:02:27 -07:00
  • b5c72611b4 change log string on pdo log messages zotlabs 2016-10-27 15:21:40 -07:00
  • 2b3b5d2c8a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-26 21:52:53 -07:00
  • d46fe20986 modernise chanview, which has a renewed purpose - to provide a connect link to foreign network members. The iframe no longer works due to content security policies, and people hated this with a passion anyway; so just provide a URL to visit. zotlabs 2016-10-26 21:50:30 -07:00
  • 9e46409517 Merge pull request #570 from fsteinel/issue-NEW zotlabs 2016-10-27 12:38:46 +11:00
  • d42da529ec zot_finger from navbar people search looping zotlabs 2016-10-26 18:35:10 -07:00
  • c1c96e01fa sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and postgresql (see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 ) Florian Steinel 2016-10-27 02:41:32 +02:00
  • aee2742951 when inserting a link, if the url begins with '!' ignore oembed and do everytthing old school. zotlabs 2016-10-26 16:44:54 -07:00
  • c3af36d33b the logic is much too complicated for the notifier. Let plugins know if they are going upstream or downstream with a simple binary variable. zotlabs 2016-10-26 02:46:14 -07:00
  • 3885aa1e8c allow .htpreconfig.php to be loaded if you can't install without special settings or require PHP logging at that time; it is ignored during normal use. zotlabs 2016-10-26 00:17:23 -07:00
  • 33b1c57092 For z_dns_check() use config values from memory and ignore DB - as this function can be called in the early stages of Setup when we first try to connect to the database. zotlabs 2016-10-25 23:32:24 -07:00
  • 441d3bf1ed make the edited header stand out slightly zotlabs 2016-10-25 20:46:57 -07:00
  • bd83936e5d send "hidden" edit activities to networks which don't support edits themselves zotlabs 2016-10-25 20:43:24 -07:00
  • 88a68b941f put all dns checking into one function, allow it to be ignored zotlabs 2016-10-25 18:27:32 -07:00
  • 084b41fc2c first cut at edit activities zotlabs 2016-10-25 16:21:56 -07:00
  • 7b713e2576 pdo - fetch assoc only zotlabs 2016-10-25 16:15:39 -07:00
  • 25982f0475 set port if non-zero (instead of non-null) zotlabs 2016-10-24 18:55:11 -07:00
  • 2d2ac98b3d Merge pull request #559 from zotlabs/pdo zotlabs 2016-10-25 11:48:22 +11:00
  • f1fc201862 not null violation in mail zotlabs 2016-10-24 17:14:06 -07:00
  • 681f45943b some more places which require dbescbin and dbunescbin zotlabs 2016-10-24 00:36:38 -07:00
  • 5dc8c54b8d found it... zotlabs 2016-10-23 21:35:06 -07:00
  • 20194bed42 this seems to work, but there are unanswered questions and is still undergoing investigation. It appears that the data stored with os_content = 1 is not being escaped in all circumstances or the scaled image data is being escaped twice. zotlabs 2016-10-23 21:27:10 -07:00
  • 06bbf494bb profile photo issue on postgres zotlabs 2016-10-23 20:01:39 -07:00
  • 21b919a76b correct encoding zotlabs 2016-10-23 19:04:42 -07:00
  • 39f0707201 fetch bytea as stream zotlabs 2016-10-23 17:53:34 -07:00
  • 8d52a278a9 Merge branch 'dev' into pdo zotlabs 2016-10-23 17:49:15 -07:00
  • 5fbba27d17 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-23 17:48:33 -07:00
  • 5c891bcfb5 need to perform dbunescbin on stored filenames as well as binary data - this is a no-op under mysql but could provide unpredictable data under postgres zotlabs 2016-10-23 17:46:29 -07:00
  • 547c700764 misplaced parens zotlabs 2016-10-23 17:23:53 -07:00
  • d30892ea60 pdo hacks zotlabs 2016-10-23 17:05:08 -07:00
  • 0b5d550780 Merge pull request #565 from anaqreon/wiki-download zotlabs 2016-10-23 07:28:38 +11:00
  • ac5ad0b9ce Merge pull request #562 from fsteinel/issue-561 zotlabs 2016-10-23 07:27:48 +11:00
  • 823c0ebb47 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-22 13:22:01 -07:00
  • 8fc87411fa php warning, $uplink didn't have a default zotlabs 2016-10-22 13:20:51 -07:00
  • 5fb173149a provide lockstate for events and remove obsolete code Mario Vavti 2016-10-22 20:44:41 +02:00
  • 02cf7274d2 Add wiki download button to export the selected wiki repo to a zip file Andrew Manning 2016-10-22 08:52:26 -04:00
  • 43de0e7f16 until we've settled on what they should be, set os_path and display_path to an emtpy string Florian Steinel 2016-10-22 08:17:26 +02:00
  • f84530c285 attach_mkdir use $os_path and $display_path initilized to an empty string Florian Steinel 2016-10-22 08:07:27 +02:00
  • 6bf92979a2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-21 21:44:37 -07:00
  • c5dcac4dbb issue #564 zotlabs 2016-10-21 21:44:15 -07:00
  • bb1b6c906d Merge pull request #563 from ilu33/dev zotlabs 2016-10-22 15:07:08 +11:00
  • aa9fef7778 squash timezone adjusted birthdays into a single day in the calendar, by lying and telling the js calendar that the end date/time is unknown zotlabs 2016-10-21 20:56:01 -07:00
  • 351f21c89f Postgres complaining again ... ilu33 2016-10-22 05:52:29 +02:00
  • ca97130a29 add column display_path to inserts into attachment, as this column is a not null column Florian Steinel 2016-10-13 16:02:18 +02:00
  • 9fea44cbc3 better fix for navbar channel autocomplete, refrain from search until a minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results. zotlabs 2016-10-21 18:15:44 -07:00
  • 5e761a1068 full revert, that wasn't working at all. Not sure why. zotlabs 2016-10-21 14:27:29 -07:00
  • afff751ff1 partial revert zotlabs 2016-10-21 14:23:49 -07:00
  • 222186d5f7 fine tune the navbar people autocomplete, as the check for minimum length wasn't taking into consideration the initial tag character, and one char search provides way too many results. The autocomplete cache doesn't search again but just searches through its cache. This means as you type more chars, if the answer wasn't included in the very first search (one char), it won't be returned. This may need further tweaking as the network grows. zotlabs 2016-10-21 14:15:29 -07:00
  • 632ad7d7f9 string update zotlabs 2016-10-21 13:50:00 -07:00
  • 331412ddff remove more corporate code - https url conversion for youtube is now handled by std_embeds plugin zotlabs 2016-10-20 17:53:15 -07:00
  • 04ac04e0ad allow a dsn override to the database via the server argument. This could be used to allow unix domain sockets and other unusual configurations. zotlabs 2016-10-20 17:04:43 -07:00
  • 29340152b6 pdo - cleanup zotlabs 2016-10-20 16:21:15 -07:00
  • 8a34f7ca7b Merge branch 'dev' into pdo zotlabs 2016-10-20 16:14:01 -07:00
  • e2e3b81f32 more pdo tweaks zotlabs 2016-10-20 16:13:06 -07:00
  • b4b5eb5bab pdo testing zotlabs 2016-10-20 15:45:48 -07:00
  • edde785219 Merge pull request #558 from dawnbreak/dev zotlabs 2016-10-21 06:15:03 +11:00
  • b71e148cea [BUGFIX] for fromStandalonePermission(). Klaus Weidenbach 2016-10-18 20:43:48 +02:00
  • 0d939b5ab0 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-20 00:33:23 -07:00
  • b983cf8b5f Merge pull request #556 from dawnbreak/QA_testing zotlabs 2016-10-20 18:33:03 +11:00
  • 81f3a5cf94 discover tab showing on network page using fresh site with no settings (it is disabled by default, but the admin setting has not yet been committed to disk). zotlabs 2016-10-19 21:50:26 -07:00
  • 3726b546d5 use pdo for postgres also zotlabs 2016-10-19 19:24:12 -07:00
  • 2702b82bc3 pdo fixes zotlabs 2016-10-19 17:23:06 -07:00
  • aee4f8d2fe pdo changes first cut zotlabs 2016-10-19 16:58:26 -07:00
  • c79c1b3913 Merge branch 'dev' into pdo zotlabs 2016-10-19 16:31:35 -07:00
  • 3da72c1ff1 [TASK] Fix travis' phpunit execution. Klaus Weidenbach 2016-10-19 00:53:08 +02:00
  • b926a4c67e when translating like activities, we're distinguishing comments from posts by mid and parent_mid; neither if which are present in the stored activity object zotlabs 2016-10-18 21:42:54 -07:00
  • 29320f8aad remove requirement that imported profile photos be in the profile photos album zotlabs 2016-10-18 18:37:58 -07:00
  • 2a59f45a3b Change the behaviour of 'use existing photo for profile'. For a channel with one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case. zotlabs 2016-10-18 18:30:50 -07:00
  • 2db7b2d948 change event behaviour - share by default. zotlabs 2016-10-18 16:46:09 -07:00
  • d55fcd055d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2016-10-18 16:29:36 -07:00