aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8 from redmatrix/devmrjive2018-04-166-17/+30
|\ | | | | Dev
| * remove some more distinct in queries and observe any regressions. this is ↵Mario Vavti2018-04-162-7/+2
| | | | | | | | related to issue #1079 and commit d47ea20aa8bb8219f7a0760e81ba3db542392390
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-163-6/+21
| |\
| | * draft-cavage issueszotlabs2018-04-151-3/+9
| | |
| | * issue with wiki synczotlabs2018-04-151-2/+9
| | |
| | * never mind. dbg(1) now gives you the basic debug result and dbg(2) gives you ↵zotlabs2018-04-141-1/+1
| | | | | | | | | | | | the verbose debug option with all the results.
| | * allow dbg(2) to only return the canonical SQL used in the query and the ↵zotlabs2018-04-141-1/+3
| | | | | | | | | | | | number of results, but not log every single result. Maybe we should use 1 for this and 2 for the full results, but I didn't really want to change the way people do things today. If anybody has a strong opinion about doing this, go ahead and change it and send a note to the developer forum.
| * | css fixesMario Vavti2018-04-151-0/+3
| | |
| * | fix regression where in the starred tab only top level posts were visibleMario Vavti2018-04-151-4/+4
| |/
* | Merge pull request #7 from redmatrix/devmrjive2018-04-1417-4887/+5989
|\| | | | | Dev
| * upgrade incutio xmlrpc library to use hubzilla curl wrapperzotlabs2018-04-131-43/+18
| |
| * Create /doc/context/fr/settings/features/help.htmlGalette Saucisse2018-04-131-0/+12
| | | | | | French translation for context help
| * Update hstrings.phpGalette Saucisse2018-04-131-338/+478
| |
| * Update hmessages.poGalette Saucisse2018-04-131-3013/+3790
| |
| * Create /doc/context/fr/admin/queue/help.htmlGalette Saucisse2018-04-131-0/+4
| | | | | | French translation for context help
| * Update help.htmlGalette Saucisse2018-04-131-1/+1
| |
| * translation correctionGalette Saucisse2018-04-131-1/+1
| |
| * Create /doc/context/fr/admin/logs/help.htmlGalette Saucisse2018-04-131-0/+8
| | | | | | French translation of context help
| * Create /doc/context/fr/channelGalette Saucisse2018-04-131-0/+6
| | | | | | French translation for context help
| * version and strings updateMario Vavti2018-04-132-1380/+1577
| |
| * fix illegal string offset warningMario Vavti2018-04-132-2/+2
| |
| * fix wrong item keyMario Vavti2018-04-131-1/+1
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-134-50/+65
| |\
| | * autosave comment enhancementszotlabs2018-04-121-9/+15
| | |
| | * work on autosavezotlabs2018-04-121-15/+30
| | |
| | * update the tags and mentions section of the member_guide with recent changeszotlabs2018-04-121-1/+3
| | |
| | * accept system_language through either get or postzotlabs2018-04-121-3/+3
| | |
| | * remove recipient name from stored notifications but keep them in emails.zotlabs2018-04-121-31/+23
| | |
| * | provide visible star status for starred postsMario Vavti2018-04-135-62/+30
| | |
* | | Merge pull request #6 from redmatrix/devmrjive2018-04-1312-49/+86
|\| | | | | | | | Dev
| * | move the thread author menu to to the wall item photo. the menu list was ↵Mario Vavti2018-04-133-15/+21
| |/ | | | | | | getting too long.
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-129-33/+62
| |\
| | * util/dcp (server to cloud file copy) better handling when destination ↵zotlabs2018-04-111-26/+38
| | | | | | | | | | | | directory is the channel root
| | * poll responses: start treating them as hidden activities now so that when ↵zotlabs2018-04-112-1/+2
| | | | | | | | | | | | this feature gets finished it will work flawlessly for versions greater than today.
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-117-6/+24
| | |\
| | * | channel delegation: push current identity and pop it on logout from the ↵zotlabs2018-04-116-6/+22
| | | | | | | | | | | | | | | | delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel.
| * | | fix issue #1047Mario Vavti2018-04-121-1/+3
| | |/ | |/|
* | | Merge pull request #5 from redmatrix/devmrjive2018-04-1253-99/+922
|\| | | | | | | | Dev
| * | also clean localStorage upon logout or channel switchMario Vavti2018-04-111-1/+2
| | |
| * | allow to toggle visibility of likes/dislikes in notificationsMario Vavti2018-04-115-4/+21
| | |
| * | wrong functionMario Vavti2018-04-111-1/+1
| |/
| * Update French hstrings.phpGalette Saucisse2018-04-101-0/+19
| | | | | | added some missing strings
| * do not get or set post category if the field is not available. remove logging.Mario Vavti2018-04-101-3/+5
| |
| * fix autosave content not cleaned after post submissionMario Vavti2018-04-101-24/+47
| |
| * last commented expiration setting in adminzotlabs2018-04-103-3/+8
| |
| * add commented_days parameter to item_expire(), default 7. Both expire_days ↵zotlabs2018-04-092-8/+11
| | | | | | | | and commented_days have to be exceeded to expire.
| * Create catcloud widget and provide a type option which can include 'cards' ↵zotlabs2018-04-092-6/+56
| | | | | | | | or 'articles'
| * Replace pushState with replaceState to prevent browser history clutter in ↵Andrew Manning2018-04-091-2/+2
| | | | | | | | Help pages.
| * Merge pull request #1053 from jschweinsberg/fix/pubstream-notificationsgit-marijus2018-04-092-3/+4
| |\ | | | | | | Public stream notifications
| | * Show "Unseen public activity" channel setting when site only public streams ↵Julian Schweinsberg2018-04-091-2/+3
| | | | | | | | | | | | are activated