Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-12-01 | 1 | -13/+16 |
|\ | |||||
| * | more wiki cleanup | Mario Vavti | 2016-12-01 | 1 | -3/+1 |
| | | |||||
| * | wiki cleanup - wip. please watch out for eventual regressions | Mario Vavti | 2016-12-01 | 1 | -10/+15 |
| | | |||||
* | | issue #607 parens not recognised inside urls | zotlabs | 2016-12-01 | 2 | -3/+3 |
|/ | |||||
* | do not call purify_html() at this place | Mario Vavti | 2016-11-30 | 1 | -2/+4 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-30 | 1 | -2/+2 |
|\ | |||||
| * | pubsites: don't list dead sites | zotlabs | 2016-11-30 | 1 | -2/+2 |
| | | |||||
* | | go live with wiki mimetypes - you can now choose if a wiki will contain ↵ | Mario Vavti | 2016-11-30 | 1 | -17/+34 |
|/ | | | | markdown or bb-code markup | ||||
* | This isn't the most elegant solution as it requires a bit of arcane ↵ | zotlabs | 2016-11-29 | 2 | -1/+3 |
| | | | | knowledge, but provide a way to step through connections with a specific tab/panel open in the connection editor. It does not close the default panel, but merely opens the one specified by a §ion= URL parameter (closing the default panel would require a major refactoring of the default panel logic). Valid choices for section currently are affinity, filter, and perms. This tab/panel selection should persist across form posting and 'prev/next'. | ||||
* | provide a fresh new look and cleaner layout and more relevant information to ↵ | zotlabs | 2016-11-29 | 2 | -55/+28 |
| | | | | siteinfo | ||||
* | more work on wiki mimetypes | Mario Vavti | 2016-11-29 | 1 | -4/+5 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-11-29 | 1 | -6/+2 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-28 | 2 | -2/+44 |
| |\ | |||||
| * | | connedit prev/next: sort in the db. | zotlabs | 2016-11-26 | 1 | -6/+2 |
| | | | |||||
* | | | some basic work for implementing mimetypes for wikis | Mario Vavti | 2016-11-28 | 1 | -4/+3 |
| |/ |/| | |||||
* | | Merge pull request #602 from anaqreon/doco | git-marijus | 2016-11-28 | 1 | -1/+32 |
|\ \ | | | | | | | Update context help content and context page element focus feature. | ||||
| * | | Add ability to include page assets in documentation pages such as images. ↵ | Andrew Manning | 2016-11-27 | 1 | -1/+32 |
| | | | | | | | | | | | | Updated Personal Channel tutorial to use local images using this new capability. | ||||
* | | | minor cleanup and remove more double encoding | Mario Vavti | 2016-11-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #601 from anaqreon/wiki | git-marijus | 2016-11-25 | 1 | -1/+12 |
|\ \ | |/ |/| | Wiki: Make a git commit when a new page is created | ||||
| * | Make a git commit when a new page is created, recording who created the page. | Andrew Manning | 2016-11-24 | 1 | -1/+12 |
| | | |||||
* | | prev-next navigation for mod_connedit | zotlabs | 2016-11-24 | 1 | -3/+36 |
|/ | |||||
* | whitespace and minor fixes | Mario Vavti | 2016-11-23 | 1 | -1/+1 |
| | |||||
* | silence headers already sent warning. issue #596 | Mario Vavti | 2016-11-23 | 1 | -6/+9 |
| | |||||
* | whitespace and coding style | Mario Vavti | 2016-11-23 | 1 | -8/+17 |
| | |||||
* | whitespace cleanup | Mario Vavti | 2016-11-23 | 1 | -25/+25 |
| | |||||
* | display wiki list on wiki landing page. | Mario Vavti | 2016-11-22 | 1 | -18/+31 |
| | |||||
* | redmatrix is no longer considered a supported platform and will not be ↵ | zotlabs | 2016-11-19 | 2 | -4/+4 |
| | | | | listed in pubsites as of 2.x | ||||
* | Hide all content if no wiki is selected except for a message saying to ↵ | Andrew Manning | 2016-11-18 | 1 | -2/+3 |
| | | | | choose one. | ||||
* | Move page list back out to the side menu, but with the new page form below ↵ | Andrew Manning | 2016-11-18 | 1 | -0/+1 |
| | | | | the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case. | ||||
* | 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 |
| | |||||
* | 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. | ||||
* | reverse logic | Mario Vavti | 2016-11-07 | 1 | -2/+2 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| |