aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-264-518/+67
|\
| * check for new permissions and update channels and connections with defaults i...redmatrix2016-07-251-0/+64
| * move openid to addonredmatrix2016-07-252-517/+0
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-252-1/+2
| |\
| * | issue #460redmatrix2016-07-251-1/+3
* | | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-2513-1515/+1877
|\ \ \ | | |/ | |/|
| * | revert multiple testMario Vavti2016-07-251-1/+1
| * | css fixesMario Vavti2016-07-252-1/+2
| |/
| * revert cloud acl selector (branched so as to continue development)redmatrix2016-07-252-20/+8
| * make drag/drop work with acl, which bypassed the formredmatrix2016-07-242-2/+4
| * trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-242-1/+9
| * add acl selection to files upload via /cloud (still missing from directory cr...redmatrix2016-07-243-7/+76
| * string update and some minor comment editsredmatrix2016-07-243-1491/+1570
| * call wall_attach rather than wall_upload for drag/drop; which means you can d...redmatrix2016-07-241-1/+1
| * Merge pull request #459 from anaqreon/jot-drag-attachhubzilla2016-07-252-1/+90
| |\
| | * Drag and drop one image file at a time into the post editor will upload it.Andrew Manning2016-07-242-1/+90
| |/
| * Merge pull request #458 from anaqreon/dragdropuploadhubzilla2016-07-245-21/+147
| |\
| | * Remove logger callsAndrew Manning2016-07-241-2/+1
| | * Multiple file upload by drag and drop with progress indicators and auto page ...Andrew Manning2016-07-244-195/+142
| | * Include credentials for session cookie in xhrAndrew Manning2016-07-231-0/+1
| | * AJAX single upload might be working, but permissions problems seem to cause f...Andrew Manning2016-07-232-14/+81
| | * Drag and drop file information display in cloud files upload form. No actual ...Andrew Manning2016-07-221-0/+112
| |/
* | Merge remote-tracking branch 'upstream/dev' into devzottel2016-07-2262-838/+1613
|\|
| * rename the patch so that it explains what it doesMario Vavti2016-07-221-0/+0
| * apply our custom patch to readmore.jsMario Vavti2016-07-222-1/+14
| * upgrade readmore.js and improve collapsing a littleMario Vavti2016-07-223-16/+40
| * 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
| * 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 l...redmatrix2016-07-211-0/+11
| * 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 las...redmatrix2016-07-202-2/+4
| | * 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 aut...redmatrix2016-07-2013-196/+133
| * | | 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 las...redmatrix2016-07-202-2/+4
| * | | 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 aut...redmatrix2016-07-2013-196/+133
| * | | | Merge branch 'dev' into permsredmatrix2016-07-204-2/+10
| |\| | |