Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | reorganise emoticons | zotlabs | 2016-11-06 | 31 | -37/+37 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-05 | 2 | -1/+11 |
|\ | |||||
| * | some fixes for the recent changes in the personal menu dropdown | Mario Vavti | 2016-11-04 | 2 | -2/+6 |
| | | |||||
| * | Merge pull request #579 from anaqreon/ui | zotlabs | 2016-11-04 | 1 | -0/+6 |
| |\ | | | | | | | Collapse navbar-collapse-1 if avatar menu is clicked. | ||||
| | * | Collapse navbar-collapse-1 if avatar menu is clicked. | Andrew Manning | 2016-11-03 | 1 | -0/+6 |
| |/ | |||||
* / | provide /locs link on settings page if there is more than one hubloc for ↵ | zotlabs | 2016-11-05 | 5 | -280/+277 |
|/ | | | | this channnel *that isn't deleted*. | ||||
* | ignore flags to dns_get_record() and look for anything | zotlabs | 2016-11-02 | 1 | -4/+7 |
| | |||||
* | issue #409 - use item_notshown for file activities to prevent display but ↵ | zotlabs | 2016-11-02 | 1 | -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 roles | zotlabs | 2016-11-02 | 1 | -4/+0 |
| | |||||
* | issue #576 - duplicate events shown | zotlabs | 2016-11-02 | 2 | -4/+3 |
| | |||||
* | silence a minor warning | zotlabs | 2016-11-02 | 1 | -0/+1 |
| | |||||
* | convert manual page updates to a display setting instead of a feature | zotlabs | 2016-11-02 | 9 | -14/+20 |
| | |||||
* | if connecting to a channel that is already pending, undo the pending and set ↵ | zotlabs | 2016-11-02 | 1 | -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 debugging | zotlabs | 2016-11-02 | 1 | -3/+0 |
| | |||||
* | issue #575, when 'nofinish' is set on an event, invalid date was ↵ | zotlabs | 2016-11-02 | 1 | -4/+8 |
| | | | | generated/stored | ||||
* | allow your own likes/comments to be updated when in static update mode | zotlabs | 2016-11-02 | 8 | -15/+43 |
| | |||||
* | Merge pull request #574 from zotlabs/static_update | git-marijus | 2016-11-02 | 8 | -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 ↵ | zotlabs | 2016-11-01 | 8 | -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. | zotlabs | 2016-11-01 | 1 | -1/+22 |
|/ | |||||
* | Merge pull request #573 from phellmes/dev | zotlabs | 2016-11-02 | 2 | -6139/+9906 |
|\ | | | | | update DE translation strings | ||||
| * | update DE translation strings | phellmes | 2016-11-01 | 2 | -6139/+9906 |
| | | |||||
* | | command line connect utility. | zotlabs | 2016-11-01 | 2 | -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 issue | zotlabs | 2016-10-31 | 2 | -2/+3 |
| | |||||
* | provide plugin restrictions based on config settings | zotlabs | 2016-10-31 | 1 | -0/+7 |
| | |||||
* | string update | zotlabs | 2016-10-30 | 3 | -505/+555 |
| | |||||
* | improve the check in 9b42bc860 | zotlabs | 2016-10-30 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-10-30 | 6 | -12/+37 |
|\ | |||||
| * | add embed bbcode to the autocomplete list | Mario Vavti | 2016-10-30 | 1 | -1/+1 |
| | | |||||
| * | fix https://zothub.de/display/9d9078d212862c5f58 | Mario Vavti | 2016-10-30 | 2 | -1/+2 |
| | | |||||
| * | update setup and install documents for PDO and the freebsd issue with | zotlabs | 2016-10-27 | 2 | -7/+31 |
| | | | | | | | | dns_get_record() | ||||
| * | change log string on pdo log messages | zotlabs | 2016-10-27 | 1 | -3/+3 |
| | | |||||
* | | possible fix for https://zothub.de/display/2d4996dd629504851d | Mario Vavti | 2016-10-30 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-26 | 11 | -19/+19 |
|\ | |||||
| * | Merge pull request #570 from fsteinel/issue-NEW | zotlabs | 2016-10-27 | 11 | -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 Steinel | 2016-10-27 | 11 | -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 ↵ | zotlabs | 2016-10-26 | 2 | -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 looping | zotlabs | 2016-10-26 | 1 | -5/+24 |
| | | |||||
* | | when inserting a link, if the url begins with '!' ignore oembed and do ↵ | zotlabs | 2016-10-26 | 1 | -5/+12 |
|/ | | | | everytthing old school. | ||||
* | the logic is much too complicated for the notifier. Let plugins know if they ↵ | zotlabs | 2016-10-26 | 1 | -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 ↵ | zotlabs | 2016-10-26 | 1 | -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 ↵ | zotlabs | 2016-10-25 | 1 | -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 slightly | zotlabs | 2016-10-25 | 1 | -1/+1 |
| | |||||
* | send "hidden" edit activities to networks which don't support edits themselves | zotlabs | 2016-10-25 | 5 | -4/+39 |
| | |||||
* | put all dns checking into one function, allow it to be ignored | zotlabs | 2016-10-25 | 5 | -11/+24 |
| | |||||
* | first cut at edit activities | zotlabs | 2016-10-25 | 4 | -5/+66 |
| | |||||
* | pdo - fetch assoc only | zotlabs | 2016-10-25 | 1 | -1/+1 |
| | |||||
* | set port if non-zero (instead of non-null) | zotlabs | 2016-10-24 | 2 | -2/+2 |
| | |||||
* | Merge pull request #559 from zotlabs/pdo | zotlabs | 2016-10-25 | 5 | -54/+123 |
|\ | | | | | Pdo DB driver | ||||
| * | found it... | zotlabs | 2016-10-23 | 1 | -2/+2 |
| | | |||||
| * | this seems to work, but there are unanswered questions and is still ↵ | zotlabs | 2016-10-23 | 1 | -5/+8 |
| | | | | | | | | 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. |