aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* more work on #453redmatrix2016-07-211-16/+15
|
* fix birthday addtocalredmatrix2016-07-211-3/+3
|
* PConfig : Check for is_null($uid) as well as false. We actually allow $uid = ↵redmatrix2016-07-211-3/+6
| | | | 0 though it shouldn't normally happen.
* zat URL auth updated to match changes to the atoken_login interfaceredmatrix2016-07-212-3/+12
|
* fail oembed if it is attempted and less than 80% of the original content is ↵redmatrix2016-07-211-0/+11
| | | | left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
* merge 1.10RC into devMario Vavti2016-07-221-2/+2
|\
| * missing $Mario Vavti2016-07-221-2/+2
| |
| * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-211-0/+1
| |\
| | * issue #411redmatrix2016-07-211-0/+1
| | |
| * | DAV auth issueredmatrix2016-07-211-0/+1
| |/
| * issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-202-2/+4
| | | | | | | | last month
| * undefined functionredmatrix2016-07-201-1/+1
| |
| * fix vevent multi-line formattingredmatrix2016-07-201-1/+3
| |
| * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-204-3/+10
| |\
| * | sort out some of the authentication mess - with luck this may fix the DAV ↵redmatrix2016-07-2013-196/+133
| | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
* | | DAV auth issueredmatrix2016-07-211-0/+1
| | |
* | | typoredmatrix2016-07-211-1/+1
| | |
* | | issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-202-2/+4
| | | | | | | | | | | | last month
* | | undefined functionredmatrix2016-07-201-1/+1
| | |
* | | delete test docredmatrix2016-07-201-37/+0
| | |
* | | Merge branch 'dev' into permsredmatrix2016-07-2014-197/+136
|\ \ \
| * | | fix vevent multi-line formattingredmatrix2016-07-201-1/+3
| | | |
| * | | sort out some of the authentication mess - with luck this may fix the DAV ↵redmatrix2016-07-2013-196/+133
| | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
* | | | Merge branch 'dev' into permsredmatrix2016-07-204-2/+10
|\| | |
| * | | Merge branch '1.10RC' into devMario Vavti2016-07-201-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RCMario Vavti2016-07-202-0/+7
| | |\ \
| | | * \ Merge pull request #456 from anaqreon/1.10RC-updatesgit-marijus2016-07-202-0/+7
| | | |\ \ | | | | | | | | | | | | Wiki delete page confirmation and max image width
| | | | * | Wiki delete page confirmation and max image widthAndrew Manning2016-07-202-0/+7
| | | | |/
| | * | / type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ↵Mario Vavti2016-07-201-1/+1
| | |/ / | | | | | | | | | | | | id. This fixes the issue that autocomplete for mail returns null for data.xid
| * | | Merge pull request #455 from anaqreon/wikigit-marijus2016-07-202-0/+7
| |\ \ \ | | | | | | | | | | Wiki delete page confirmation and max image width
| | * \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-2070-2515/+2531
| | |\ \ \
| | * | | | Set max-width for embedded imagesAndrew Manning2016-07-091-0/+4
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0922-1674/+1724
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0115-3589/+3645
| | |\ \ \ \ \
| | * | | | | | JavaScript popup for page delete confirmationAndrew Manning2016-07-011-0/+3
| | | | | | | |
| * | | | | | | Merge branch '1.10RC' into devMario Vavti2016-07-201-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | fix /mail wsod issue reported by giac hellvecioMario Vavti2016-07-201-2/+2
| | | |_|_|/ | | |/| | |
| | * | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-181-1/+1
| | |\ \ \ \
| | * | | | | runaway cron emailsredmatrix2016-07-181-10/+2
| | | | | | |
* | | | | | | fix the forum detection in include/zotredmatrix2016-07-193-7/+18
| | | | | | |
* | | | | | | another couple of minor perms fixesredmatrix2016-07-192-8/+10
| | | | | | |
* | | | | | | permission fixesredmatrix2016-07-196-25/+19
| | | | | | |
* | | | | | | fixes to permsredmatrix2016-07-192-4/+4
| | | | | | |
* | | | | | | add test sequenceredmatrix2016-07-191-0/+37
| | | | | | |
* | | | | | | translate more old perms callsredmatrix2016-07-194-5/+5
| | | | | | |
* | | | | | | Merge branch 'dev' into permsredmatrix2016-07-192-1/+2
|\| | | | | |
| * | | | | | doc correctionredmatrix2016-07-191-1/+1
| | | | | | |
| * | | | | | issue #411redmatrix2016-07-191-0/+1
| | | | | | |
* | | | | | | yet more grungy perms work.redmatrix2016-07-191-37/+36
| | | | | | |
* | | | | | | Merge branch 'dev' into permsredmatrix2016-07-181-10/+2
|\| | | | | |