aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
...
| * | set App::$error on 404 so we don't get two 'Page not found.' page bodies.redmatrix2016-07-261-0/+1
| |/
| * URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav cli...Mario Vavti2016-07-261-1/+2
| * move openid to addonredmatrix2016-07-252-517/+0
| * make drag/drop work with acl, which bypassed the formredmatrix2016-07-241-0/+2
| * trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-241-0/+8
| * add acl selection to files upload via /cloud (still missing from directory cr...redmatrix2016-07-242-1/+58
| * string update and some minor comment editsredmatrix2016-07-241-2/+2
| * Multiple file upload by drag and drop with progress indicators and auto page ...Andrew Manning2016-07-241-1/+2
| * more work on #453redmatrix2016-07-211-16/+15
| * PConfig : Check for is_null($uid) as well as false. We actually allow $uid = ...redmatrix2016-07-211-3/+6
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2126-225/+567
|\|
| * merge 1.10RC into devMario Vavti2016-07-221-2/+2
| |\
| | * missing $Mario Vavti2016-07-221-2/+2
| | * DAV auth issueredmatrix2016-07-211-0/+1
| | * issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+3
| | * undefined functionredmatrix2016-07-201-1/+1
| | * Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-202-3/+3
| | |\
| | * | sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-207-110/+26
| * | | DAV auth issueredmatrix2016-07-211-0/+1
| * | | issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+3
| * | | undefined functionredmatrix2016-07-201-1/+1
| * | | Merge branch 'dev' into permsredmatrix2016-07-207-110/+26
| |\ \ \
| | * | | sort out some of the authentication mess - with luck this may fix the DAV aut...redmatrix2016-07-207-110/+26
| * | | | Merge branch 'dev' into permsredmatrix2016-07-202-2/+3
| |\| | |
| * | | | fix the forum detection in include/zotredmatrix2016-07-191-2/+2
| * | | | permission fixesredmatrix2016-07-193-18/+11
| * | | | fixes to permsredmatrix2016-07-191-1/+1
| * | | | translate more old perms callsredmatrix2016-07-192-3/+3
| * | | | Merge branch 'dev' into permsredmatrix2016-07-191-1/+1
| |\ \ \ \
| * | | | | more perms work (a lot more)redmatrix2016-07-183-30/+80
| * | | | | more perms workredmatrix2016-07-181-0/+9
| * | | | | Merge branch 'dev' into permsredmatrix2016-07-1711-6/+201
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | more perms workredmatrix2016-07-132-8/+14
| * | | | | deprecate/remove json_decode_plusredmatrix2016-07-132-4/+4
| * | | | | Merge branch 'dev' into permsredmatrix2016-07-131-2/+4
| |\ \ \ \ \
| * | | | | | lots more permission workredmatrix2016-07-134-22/+43
| * | | | | | Merge branch 'dev' into permsredmatrix2016-07-132-26/+60
| |\ \ \ \ \ \
| * | | | | | | more work on permsredmatrix2016-07-123-18/+10
| * | | | | | | Merge branch 'dev' into permsredmatrix2016-07-1210-22/+180
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-118-38/+20
| |\ \ \ \ \ \ \ \
| * | | | | | | | | more perms work - notably the stuff in public_permsredmatrix2016-07-111-7/+13
| * | | | | | | | | more permissions workredmatrix2016-07-093-19/+35
| * | | | | | | | | more work on permsredmatrix2016-07-092-2/+5
| * | | | | | | | | revise how we store perm_limitsredmatrix2016-07-071-31/+8
| * | | | | | | | | more work on permissionsredmatrix2016-07-052-51/+64
| * | | | | | | | | Merge branch 'dev' into permsredmatrix2016-07-052-5/+281
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | start to refactor the permission rolesredmatrix2016-07-042-23/+175
| * | | | | | | | | | more heavy lifting on xtensible permsredmatrix2016-07-044-9/+12
| * | | | | | | | | | more heavy lifting on extensible permsredmatrix2016-07-042-3/+22
| * | | | | | | | | | minorredmatrix2016-07-041-1/+1