Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wiki: simplify permission model, reduce duplicate calls to get the same ↵ | zotlabs | 2016-11-15 | 1 | -115/+102 |
| | | | | channel info and permissions, return the owner permissions with the normal permission check (keeping all permission fetching in one place), rename the 'channel' variable to 'owner' in several places to identify this channel role more clearly as to the way it is being used in this module, update the deprecated call to proc_run (include/notifier) and make several notice messages translatable. | ||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-11-14 | 1 | -0/+4 |
|\ | |||||
| * | SECURITY: public calendar leaks connection information (birthdays) when ↵ | zotlabs | 2016-11-14 | 1 | -0/+4 |
| | | | | | | | | view_contacts is not allowed | ||||
* | | Moved delete wiki button into new edit wiki form, opened by edit wiki icon ↵ | Andrew Manning | 2016-11-14 | 1 | -1/+0 |
|/ | | | | in wiki list | ||||
* | zidify wiki content | zotlabs | 2016-11-13 | 1 | -2/+2 |
| | |||||
* | don't send notification for posts/comments on old conversations that were ↵ | zotlabs | 2016-11-12 | 1 | -0/+4 |
| | | | | refetched after having expired. We'll accomplish this by limiting notifications to items posted within the last month. | ||||
* | Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved ↵ | Andrew Manning | 2016-11-12 | 1 | -0/+2 |
| | | | | page tools in there as well as new page and new wiki | ||||
* | deprecate/remove get_channel_by_nick() which is just a less generalised ↵ | zotlabs | 2016-11-08 | 4 | -19/+24 |
| | | | | variant of channelx_by_nick() | ||||
* | more api work | zotlabs | 2016-11-08 | 1 | -5/+3 |
| | |||||
* | more api re-org | zotlabs | 2016-11-08 | 1 | -2/+4 |
| | |||||
* | a bit more background work to support private mail preview | zotlabs | 2016-11-08 | 1 | -3/+17 |
| | |||||
* | move twitter api to addon; there's still a bit of cleanup remaining, mostly ↵ | zotlabs | 2016-11-08 | 1 | -1/+11 |
| | | | | dealing with abstracting the authentication calls and separating out the twitter authentication structure from the zot api. | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-07 | 1 | -2/+2 |
|\ | |||||
| * | reverse logic | Mario Vavti | 2016-11-07 | 1 | -2/+2 |
| | | |||||
* | | cleanup and re-organise the voting and attendance buttons | zotlabs | 2016-11-07 | 1 | -0/+4 |
|/ | |||||
* | provide /locs link on settings page if there is more than one hubloc for ↵ | zotlabs | 2016-11-05 | 2 | -5/+1 |
| | | | | this channnel *that isn't deleted*. | ||||
* | 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 | 6 | -5/+8 |
| | |||||
* | 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 | 5 | -8/+35 |
| | |||||
* | feature: static page update as opposed to live update of conversations on ↵ | zotlabs | 2016-11-01 | 5 | -0/+10 |
| | | | | 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. | ||||
* | command line connect utility. | zotlabs | 2016-11-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
* | string update | zotlabs | 2016-10-30 | 1 | -9/+7 |
| | |||||
* | update setup and install documents for PDO and the freebsd issue with | zotlabs | 2016-10-27 | 1 | -3/+3 |
| | | | | dns_get_record() | ||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-26 | 5 | -5/+5 |
|\ | |||||
| * | Merge pull request #570 from fsteinel/issue-NEW | zotlabs | 2016-10-27 | 5 | -5/+5 |
| |\ | | | | | | | 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 | 5 | -5/+5 |
| | | | | | | | | | | | | | | | | | | 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 | 1 | -15/+32 |
|/ / | | | | | | | 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. | ||||
* | send "hidden" edit activities to networks which don't support edits themselves | zotlabs | 2016-10-25 | 3 | -1/+3 |
| | |||||
* | put all dns checking into one function, allow it to be ignored | zotlabs | 2016-10-25 | 1 | -2/+1 |
| | |||||
* | first cut at edit activities | zotlabs | 2016-10-25 | 1 | -0/+2 |
| | |||||
* | profile photo issue on postgres | zotlabs | 2016-10-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-23 | 2 | -2/+34 |
|\ | |||||
| * | Merge pull request #565 from anaqreon/wiki-download | zotlabs | 2016-10-23 | 1 | -0/+30 |
| |\ | | | | | | | Add wiki download button to export the selected wiki repo to a zip file | ||||
| | * | Add wiki download button to export the selected wiki repo to a zip file | Andrew Manning | 2016-10-22 | 1 | -0/+30 |
| | | | |||||
| * | | Merge pull request #562 from fsteinel/issue-561 | zotlabs | 2016-10-23 | 1 | -2/+4 |
| |\ \ | | | | | | | | | add column display_path to inserts into attachment, as this column is… | ||||
| | * | | until we've settled on what they should be, set os_path and display_path to ↵ | Florian Steinel | 2016-10-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | an emtpy string | ||||
| | * | | add column display_path to inserts into attachment, as this column is a not ↵ | Florian Steinel | 2016-10-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path | ||||
* | | | | need to perform dbunescbin on stored filenames as well as binary data - this ↵ | zotlabs | 2016-10-23 | 3 | -5/+5 |
|/ / / | | | | | | | | | | is a no-op under mysql but could provide unpredictable data under postgres | ||||
* | / | provide lockstate for events and remove obsolete code | Mario Vavti | 2016-10-22 | 1 | -5/+2 |
| |/ |/| | |||||
* | | Merge pull request #563 from ilu33/dev | zotlabs | 2016-10-22 | 1 | -1/+1 |
|\ \ | | | | | | | Postgres complaining again ... | ||||
| * | | Postgres complaining again ... | ilu33 | 2016-10-22 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | ```sql UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = 13 LIMIT 1) WHERE abook_profile = '' AND abook_channel = 13 ; returned false ERROR: syntax error at or near "profile" LINE 1: ... SET abook_profile = (SELECT profile_guid AS FROM profile WH... ^ ``` | ||||
* / | squash timezone adjusted birthdays into a single day in the calendar, by ↵ | zotlabs | 2016-10-21 | 1 | -0/+6 |
|/ | | | | lying and telling the js calendar that the end date/time is unknown | ||||
* | full revert, that wasn't working at all. Not sure why. | zotlabs | 2016-10-21 | 1 | -3/+1 |
| | |||||
* | partial revert | zotlabs | 2016-10-21 | 1 | -3/+2 |
| |