aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-1311-6763/+10553
|\
| * update dutch stringsjeroenpraat2016-12-132-6631/+10513
| * dropdown position fixesMario Vavti2016-12-132-4/+3
| * bring lockview to wikilistMario Vavti2016-12-133-6/+14
| * do not increase opacity to more than 1Mario Vavti2016-12-131-1/+1
| * simplify wikilist widgetMario Vavti2016-12-132-120/+12
| * Merge pull request #619 from anaqreon/devgit-marijus2016-12-131-1/+10
| |\
| | * Make region_1 table of contents "unsticky" when width is less than 768px for ...Andrew Manning2016-12-121-1/+10
| |/
* / document the stream_item hook before I forgetzotlabs2016-12-122-0/+16
|/
* clarifications of some of the descriptionszotlabs2016-12-121-11/+11
* bump versionMario Vavti2016-12-121-1/+1
* update changelogMario Vavti2016-12-121-0/+85
* wiki: indicate saved state for bbcode typeMario Vavti2016-12-121-7/+6
* some preliminary work for email notification of likes - potentially destabili...zotlabs2016-12-114-0/+83
* move the rest of superblock out of corezotlabs2016-12-112-48/+14
* clone sync missing for some item delete operationszotlabs2016-12-112-28/+36
* show doc section heading in titlebarMario Vavti2016-12-112-2/+14
* This needs a bit more word-smithing to be concise and also accurate; but I ne...zotlabs2016-12-101-1/+1
* drug dealers have userszotlabs2016-12-101-4/+4
* fix embed-image for fullscreen mode and some adjustments for /helpMario Vavti2016-12-104-41/+29
* fix typo and do not do anything on resize if not fullscreenMario Vavti2016-12-101-2/+4
* even more wiki fullscreen optimisationMario Vavti2016-12-102-4/+9
* more wiki fullscreen optimisationMario Vavti2016-12-102-5/+26
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-12-109-4918/+5277
|\
| * Merge pull request #617 from anaqreon/docogit-marijus2016-12-104-8/+30
| |\
| | * Only display h1 headings in sticky side nav. Toggle display of detailed TOC a...Andrew Manning2016-12-094-8/+30
| * | Merge pull request #618 from phellmes/devgit-marijus2016-12-102-4897/+4995
| |\ \ | | |/ | |/|
| | * Update DE translation stringsphellmes2016-12-102-4897/+4995
| |/
| * bring back a few of the doc edits from overlapping checkinszotlabs2016-12-092-7/+240
| * router error reportingzotlabs2016-12-091-6/+12
* | wiki fullscreen optimisationMario Vavti2016-12-103-8/+35
|/
* superblock issue + string updatezotlabs2016-12-092-105/+109
* Merge pull request #616 from anaqreon/docozotlabs2016-12-097-28/+175
|\
| * Condense sticky nav TOC to h1 only. Add deep TOC to top of each page. Adjust ...Andrew Manning2016-12-083-11/+25
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-082-1/+8
| |\ | |/ |/|
* | Report the WebDAV endpoint on the settings page (under the reddress) if the a...zotlabs2016-12-082-1/+8
* | Merge pull request #615 from anaqreon/docozotlabs2016-12-0914-1498/+2151
|\ \
| | * Add hub snapshot tool page to admin sectionAndrew Manning2016-12-082-0/+128
| | * Replace Hubzilla with $Projectname more. Revise code block side-scrollAndrew Manning2016-12-083-17/+22
| |/
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2016-12-081-24/+16
| |\ | |/ |/|
* | don't alter received/changed timestamps when editingzotlabs2016-12-081-14/+2
* | only update the 'changed' timestamp for recent item_store eventszotlabs2016-12-081-10/+14
| * Convert consolidated pages back to BBcode and Markdown where possibleAndrew Manning2016-12-088-1291/+1139
| * Convert about sections back to bbcode, update some formatting.Andrew Manning2016-12-076-207/+1012
|/
* always check api_userzotlabs2016-12-071-8/+19
* api_albumszotlabs2016-12-072-19/+85
* document the api filedata callzotlabs2016-12-073-4/+70
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-12-072-258/+278
|\
| * Merge pull request #614 from mjfriaza/devzotlabs2016-12-082-258/+278
| |\
| | * Updated the Spanish translationManuel Jiménez Friaza2016-12-072-258/+278