aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-311-1/+1
|\
| * issue #466, sql typoredmatrix2016-07-281-1/+1
| |
* | Improved UI. Removed logger statements.Andrew Manning2016-07-311-9/+17
| |
* | Import element selection page added to allow selective importing.Andrew Manning2016-07-301-22/+91
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3012-554/+103
|\|
| * github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-271-1/+0
| |
| * fix italian strings (messed up by rtl variable); and finish removing openid ↵redmatrix2016-07-271-12/+0
| | | | | | | | from core
| * add the hidden flag alsoredmatrix2016-07-271-1/+2
| |
| * rework drag and drop to drag directly into files area, implement the default ↵Mario Vavti2016-07-271-75/+0
| | | | | | | | upload button to work with the same mechanism as drag and drop, revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well with the new cloud upload mechanism
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-261-0/+75
| |\
| | * Merge pull request #463 from git-marijus/devhubzilla2016-07-271-0/+75
| | |\ | | | | | | | | allow multiple-file cloud upload
| | | * allow multiple-file cloud uploadMario Vavti2016-07-261-0/+75
| | | |
| * | | don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |/ /
| * | restrict url cache to 254 maxlenredmatrix2016-07-261-0/+5
| | |
| * | missing sredmatrix2016-07-261-1/+1
| | |
| * | 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 ↵Mario Vavti2016-07-261-1/+2
| | | | | | | | clients
| * 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 ↵redmatrix2016-07-242-1/+58
| | | | | | | | creation)
| * 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
| | | | | | | | reload
| * 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
| | | | | | | | 0 though it shouldn't normally happen.
* | 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 ↵redmatrix2016-07-201-1/+3
| | | | | | | | | | | | last month
| | * 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 ↵redmatrix2016-07-207-110/+26
| | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
| * | | DAV auth issueredmatrix2016-07-211-0/+1
| | | |
| * | | issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-201-1/+3
| | | | | | | | | | | | | | | | last month
| * | | 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 ↵redmatrix2016-07-207-110/+26
| | | | | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
| * | | | 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
| |\ \ \ \ \