Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-19 | 1 | -1/+1 |
|\ | |||||
| * | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'dev' into merge | zotlabs | 2017-03-18 | 1 | -0/+1 |
|\| | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
| |\ | |||||
| | * | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
| |\| | |||||
| | * | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| | | | |||||
* | | | various input filter fixes | zotlabs | 2017-03-18 | 7 | -18/+34 |
| | | | |||||
* | | | remove include/widgets.php | zotlabs | 2017-03-16 | 4 | -11/+1 |
| | | | |||||
* | | | more work related to attach/photo and os_path, display_path and general code ↵ | zotlabs | 2017-03-15 | 2 | -36/+40 |
| | | | | | | | | | | | | cleanup | ||||
* | | | input filter updates | zotlabs | 2017-03-14 | 2 | -16/+6 |
| | | | |||||
* | | | code_allowed is a real mess. Start the cleanup by remving the account level ↵ | zotlabs | 2017-03-13 | 2 | -24/+4 |
| | | | | | | | | | | | | code allow and limiting to specific channels only. This reduces the possibility of cross channel security issues coming into play. Then provide a single function for checking the code permission. This is only partially done as we often need to check against the observer or logged in channel as well as the resource owner to ensure that this only returns true for local channels which also own the requested resource. | ||||
* | | | better handling of mimetype security | zotlabs | 2017-03-12 | 2 | -18/+7 |
| | | | |||||
* | | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 1 | -1/+1 |
|\| | | |||||
| * | | Monday is a proper name and should be capitalised (except in private ↵ | zotlabs | 2017-03-08 | 1 | -1/+1 |
| |/ | | | | | | | conversation amongst unix geeks). | ||||
* / | one role. | zotlabs | 2017-03-09 | 1 | -7/+0 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 1 | -1/+1 |
|\ | |||||
| * | reset schema value after we empty and repopulate it. second half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -1/+1 |
| | | |||||
* | | activity widget - like the forum widget but represents unseen activity by ↵ | zotlabs | 2017-03-02 | 6 | -4/+29 |
|/ | | | | author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding. | ||||
* | Merge pull request #686 from dawnbreak/markdown | zotlabs | 2017-03-01 | 3 | -87/+86 |
|\ | | | | | Upgrade PHP Markdown library. | ||||
| * | :arrow_up: :hammer: Upgrade PHP Markdown library. | Klaus Weidenbach | 2017-02-27 | 3 | -87/+86 |
| | | | | | | | | | | | | The current version throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the Markdown library to the current PHP Markdown Lib 1.7.0. Used composer to manage this library. | ||||
* | | provide 'session' option to z_fetch_url to assist with remote fetches ↵ | zotlabs | 2017-02-27 | 1 | -1/+1 |
| | | | | | | | | requiring magic auth | ||||
* | | make magic-auth work with profile vcard fetch | zotlabs | 2017-02-27 | 1 | -1/+2 |
| | | |||||
* | | fetch profile vcard for connection | zotlabs | 2017-02-27 | 1 | -0/+45 |
| | | |||||
* | | prep work | zotlabs | 2017-02-27 | 1 | -0/+1 |
|/ | |||||
* | fix js issue in markdown mimetype wikis if content contains quotes | Mario Vavti | 2017-02-27 | 1 | -5/+3 |
| | |||||
* | set minversion and maxversion for themes in ↵ | Mario Vavti | 2017-02-27 | 2 | -4/+6 |
| | | | | view/theme/themename/php/theme.php instead of separate file. | ||||
* | add a minversion to the theme and fallback to default if requirement is not ↵ | Mario Vavti | 2017-02-26 | 3 | -5/+18 |
| | | | | met. mark incompatible themes in the theme selector | ||||
* | send sync packet on profile photo permissions change | zotlabs | 2017-02-25 | 1 | -0/+9 |
| | |||||
* | escape tags on viewsrc output in case it is not text/bbcode. | zotlabs | 2017-02-25 | 1 | -1/+3 |
| | |||||
* | use chanlink_url() in directory since the xchan might not yet be available ↵ | Mario Vavti | 2017-02-24 | 1 | -1/+1 |
| | | | | on our server | ||||
* | deleting profile vcard entries was pretty well borked | zotlabs | 2017-02-23 | 1 | -2/+4 |
| | |||||
* | more work on profile vcards - still a lot of work to go | zotlabs | 2017-02-23 | 1 | -9/+27 |
| | |||||
* | more places to use chanlink_hash() instead of chanlink_url() for profile_link | Mario Vavti | 2017-02-23 | 3 | -3/+3 |
| | |||||
* | apps improvements | Mario Vavti | 2017-02-22 | 2 | -3/+7 |
| | |||||
* | use head_add_link() for feed discovery | zotlabs | 2017-02-21 | 6 | -30/+44 |
| | |||||
* | display page not updating after comment | zotlabs | 2017-02-21 | 1 | -23/+22 |
| | |||||
* | do not lock out channels with only read perms from all post actions. we ↵ | Mario Vavti | 2017-02-21 | 1 | -5/+0 |
| | | | | check read/write permissions for each command later in the process | ||||
* | update fr translation | zotlabs | 2017-02-20 | 1 | -2/+0 |
| | |||||
* | fix several places where head_add_(css|js) functions have been used ↵ | zotlabs | 2017-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work: - if there is no preceding / character, we look for the file within all the appropriate theme directories. - otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir - files beginning with // are considered to be schemeless URLs. Therefore 'foo.css' means find the best theme-able representation of foo.css. '/library/foo.css' means only use the version of foo.css that is in /library. | ||||
* | util/pconfig - don't enumerate empty arrays, mod_acl - add more comments | zotlabs | 2017-02-13 | 1 | -8/+22 |
| | |||||
* | add default permcat to channel settings form | zotlabs | 2017-02-12 | 1 | -1/+18 |
| | |||||
* | testing and bug fixes virtual profile groups | zotlabs | 2017-02-12 | 1 | -2/+37 |
| | |||||
* | Create virtual privacy groups for private profile member lists | zotlabs | 2017-02-12 | 4 | -20/+27 |
| | |||||
* | more permissions optimisations | zotlabs | 2017-02-09 | 2 | -22/+17 |
| | |||||
* | use profile_store_lowlevel() when creating additional profiles | zotlabs | 2017-02-09 | 1 | -9/+10 |
| | |||||
* | minor theming and whitespace | zotlabs | 2017-02-08 | 3 | -1/+4 |
| | |||||
* | bringer - all basic functionality is implemented | zotlabs | 2017-02-08 | 2 | -18/+26 |
| | |||||
* | initial permcat creation ability, in /settings/permcats; functional permcat ↵ | zotlabs | 2017-02-07 | 1 | -0/+111 |
| | | | | creation for testing but still needs a lot of UX work before promoting the ability | ||||
* | atokens - we only need one permission column | zotlabs | 2017-02-07 | 1 | -1/+2 |
| |