aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #580 from zzottel/devzotlabs2016-11-081-2/+2
|\ | | | | fix a fatal error with incorrect DB object access
| * fix a fatal error with incorrect DB object accesszottel2016-11-071-2/+2
|/
* reorganise emoticonszotlabs2016-11-0631-37/+37
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-052-1/+11
|\
| * some fixes for the recent changes in the personal menu dropdownMario Vavti2016-11-042-2/+6
| |
| * Merge pull request #579 from anaqreon/uizotlabs2016-11-041-0/+6
| |\ | | | | | | Collapse navbar-collapse-1 if avatar menu is clicked.
| | * Collapse navbar-collapse-1 if avatar menu is clicked.Andrew Manning2016-11-031-0/+6
| |/
* / provide /locs link on settings page if there is more than one hubloc for ↵zotlabs2016-11-055-280/+277
|/ | | | this channnel *that isn't deleted*.
* ignore flags to dns_get_record() and look for anythingzotlabs2016-11-021-4/+7
|
* issue #409 - use item_notshown for file activities to prevent display but ↵zotlabs2016-11-021-1/+1
| | | | 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.
* provide merged usermenu div for all server roleszotlabs2016-11-021-4/+0
|
* issue #576 - duplicate events shownzotlabs2016-11-022-4/+3
|
* silence a minor warningzotlabs2016-11-021-0/+1
|
* convert manual page updates to a display setting instead of a featurezotlabs2016-11-029-14/+20
|
* if connecting to a channel that is already pending, undo the pending and set ↵zotlabs2016-11-021-2/+23
| | | | 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.
* remove debuggingzotlabs2016-11-021-3/+0
|
* issue #575, when 'nofinish' is set on an event, invalid date was ↵zotlabs2016-11-021-4/+8
| | | | generated/stored
* allow your own likes/comments to be updated when in static update modezotlabs2016-11-028-15/+43
|
* Merge pull request #574 from zotlabs/static_updategit-marijus2016-11-028-0/+27
|\ | | | | feature: static page update as opposed to live update of conversation…
| * feature: static page update as opposed to live update of conversations on ↵zotlabs2016-11-018-0/+27
| | | | | | | | 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.
* | retry liveupdate up to 10 times if we receive incomplete/truncated html data.zotlabs2016-11-011-1/+22
|/
* Merge pull request #573 from phellmes/devzotlabs2016-11-022-6139/+9906
|\ | | | | update DE translation strings
| * update DE translation stringsphellmes2016-11-012-6139/+9906
| |
* | command line connect utility.zotlabs2016-11-012-2/+66
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: util/connect uid|nick channel uid|nick must be a local channel. The target channel can be any channel. If a nick is supplied as a target it is assumed to refer to a channel on the localhost unless @host is provided. RSS feeds and remote networks can also be connected, assuming the appropriate protocols are already enabled for the local channel. If the target channel is a non-forum on the local system and you wish bi-directional communication to be enabled you will probably need to use a second connnect command with the source and target reversed. Examples: util/connect bob marketing Connects bob to the marketing channel util/connect marketing bob Connects the marketing channel to bob. util/connect 6 channelone@macgirvin.com Connects the channel with channel_id 6 to the Channel One public forum. util/connect bob https://mysite.foo/feed.rss Connects bob to an RSS feed if RSS feeds are allowed as connections on this site util/connect bob jb@diasp.org Connects bob to a diaspora account on diap.org (both the site and Bob's channel must previously have the Diaspora Protocol enabled).
* bbcode event formatting issuezotlabs2016-10-312-2/+3
|
* provide plugin restrictions based on config settingszotlabs2016-10-311-0/+7
|
* string updatezotlabs2016-10-303-505/+555
|
* improve the check in 9b42bc860zotlabs2016-10-301-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-10-306-12/+37
|\
| * add embed bbcode to the autocomplete listMario Vavti2016-10-301-1/+1
| |
| * fix https://zothub.de/display/9d9078d212862c5f58Mario Vavti2016-10-302-1/+2
| |
| * update setup and install documents for PDO and the freebsd issue withzotlabs2016-10-272-7/+31
| | | | | | | | dns_get_record()
| * change log string on pdo log messageszotlabs2016-10-271-3/+3
| |
* | possible fix for https://zothub.de/display/2d4996dd629504851dMario Vavti2016-10-301-2/+2
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-2611-19/+19
|\
| * Merge pull request #570 from fsteinel/issue-NEWzotlabs2016-10-2711-19/+19
| |\ | | | | | | sql: limit 1 for UPDATE and DELETE is not supported …
| | * sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and ↵Florian Steinel2016-10-2711-19/+19
| | | | | | | | | | | | | | | | | | postgresql (see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 )
* | | modernise chanview, which has a renewed purpose - to provide a connect link ↵zotlabs2016-10-262-17/+33
|/ / | | | | | | 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.
* | zot_finger from navbar people search loopingzotlabs2016-10-261-5/+24
| |
* | when inserting a link, if the url begins with '!' ignore oembed and do ↵zotlabs2016-10-261-5/+12
|/ | | | everytthing old school.
* the logic is much too complicated for the notifier. Let plugins know if they ↵zotlabs2016-10-261-1/+4
| | | | are going upstream or downstream with a simple binary variable.
* allow .htpreconfig.php to be loaded if you can't install without special ↵zotlabs2016-10-261-0/+6
| | | | | | settings or require PHP logging at that time; it is ignored during normal use.
* For z_dns_check() use config values from memory and ignore DB - as this ↵zotlabs2016-10-251-1/+6
| | | | function can be called in the early stages of Setup when we first try to connect to the database.
* make the edited header stand out slightlyzotlabs2016-10-251-1/+1
|
* send "hidden" edit activities to networks which don't support edits themselveszotlabs2016-10-255-4/+39
|
* put all dns checking into one function, allow it to be ignoredzotlabs2016-10-255-11/+24
|
* first cut at edit activitieszotlabs2016-10-254-5/+66
|
* pdo - fetch assoc onlyzotlabs2016-10-251-1/+1
|
* set port if non-zero (instead of non-null)zotlabs2016-10-242-2/+2
|
* Merge pull request #559 from zotlabs/pdozotlabs2016-10-255-54/+123
|\ | | | | Pdo DB driver
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 01:31:12 +0000