aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #600 from toppoint/devzotlabs2016-12-151-0/+53
|\
| * Drop on switch for notificationsilu332016-12-151-5/+2
| * Missing single quotesilu332016-12-151-2/+2
| * Merge branch 'dev' of https://github.com/toppoint/hubzilla into devxxx2016-12-150-0/+0
| |\
| | * Configuring email notifications per channelilu332016-11-241-0/+56
| * | Configuring email notifications per channelilu332016-12-151-0/+56
* | | postgres is picky about this stuffzotlabs2016-12-141-2/+2
|/ /
* | issue #446 apps usability - disable app if attached to a plugin that is unins...zotlabs2016-12-149-30/+87
* | markdown regexzotlabs2016-12-141-2/+3
* | fix regexMario Vavti2016-12-141-1/+1
* | wiki: do not show revert buttons if we do not have write perms and minor cleanupMario Vavti2016-12-145-19/+13
* | fix btn-group renderingMario Vavti2016-12-141-16/+2
* | use absolute namespace in case this gets movedzotlabs2016-12-131-1/+1
* | tag and mention handling in private mail (which required refactoring the bbco...zotlabs2016-12-135-78/+76
* | update hook docozotlabs2016-12-132-0/+6
* | add plugin hook to zot_best_algorithm()zotlabs2016-12-131-0/+5
* | mail preview (basic functionality)zotlabs2016-12-133-1/+62
* | restructuring include/message for mail previewzotlabs2016-12-131-32/+44
* | 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