aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-0511-41/+68
|\
| * move str_replace inside if clauseMario Vavti2018-09-051-1/+1
| * hide cover photo by default and show it only if conditions are metMario Vavti2018-09-052-2/+4
| * revert "Add bottom margin on aside elements and main to allow for viewport fo...Mario Vavti2018-09-052-12/+2
| * Revert "Fix jumpy sidebars"Mario Vavti2018-09-051-3/+0
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-052-12/+29
| |\
| | * Merge branch 'fix-authorcomment-fix' into 'dev'Mario2018-09-052-12/+29
| | |\
| | | * Corrected resubmit of fixes to Authors unable to comment on posts they author...M.Dent2018-09-042-12/+29
| * | | bump versionMario Vavti2018-09-051-1/+1
| |/ /
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-052-22/+7
| |\|
| | * Revert "Fix: Authors unable to comment on posts they authored when under owne...Mario Vavti2018-09-032-22/+7
| * | instead of not displaying the cover-photo at all after first page load, load ...Mario Vavti2018-09-053-8/+29
| |/
| * Merge branch 'add-delivery-status-info' into 'dev'Mario2018-09-022-7/+22
| |\
| | * Fix: Authors unable to comment on posts they authored when under owned by oth...M.Dent2018-09-012-7/+22
| * | fix undefined constant warningMario Vavti2018-09-011-1/+1
| * | do not count sys channel in totalsMario Vavti2018-09-011-1/+1
| * | update 1218: missing default value for pgMario Vavti2018-08-311-2/+2
* | | detect and automatically repair duplicate plugin hook scenarios.zotlabs2018-09-051-16/+40
|/ /
* | Merge branch 'call-hooks-optimization' into 'dev'Mario2018-08-301-1/+1
|\ \
| * | Micro-optimization to call_hooks()M.Dent2018-08-291-1/+1
* | | Merge branch 'add-delivery-status-info' into 'dev'Mario2018-08-301-0/+1
|\ \ \ | | |/ | |/|
| * | Add dreport_process hookM.Dent2018-08-291-0/+1
| |/
* | html-to-markdown adds a backslash infront of a hash after each new line - man...Mario Vavti2018-08-291-1/+4
* | db update to get rid of bogus activitypub xchans which got created due to a b...Mario Vavti2018-08-292-1/+27
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-292-1/+3
|\
| * redirect stdout/stderr on cron commandzotlabs2018-08-282-1/+3
* | add paragonie and symfonie since ramsey/uuid appears to require themMario Vavti2018-08-2814-0/+512
* | update composer libs and add ramsey/uuidMario Vavti2018-08-2896-1241/+6276
* | remove distinct from network query again until performance issue is resolved ...Mario Vavti2018-08-271-2/+2
* | Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-273-2/+11
|\ \
| * | Add hook to extend conv_item cog dropdown menuM.Dent2018-08-262-0/+9
| * | Get full page of itemsM.Dent2018-08-231-2/+2
* | | Merge branch 'dev' into 'dev'Mario2018-08-275-11/+19
|\ \ \
| * | | Update wiki.tplMax Kostikov2018-08-251-2/+2
| * | | Merge branch 'revert-c16fda1c' into 'dev'Max Kostikov2018-08-251-428/+428
| |\ \ \
| | * | | Revert "Update wiki.tpl"Max Kostikov2018-08-251-428/+428
| |/ / /
| * | | Merge branch 'revert-ff1a0d21' into 'dev'Max Kostikov2018-08-251-1/+1
| |\ \ \
| | * | | Revert "Update wiki.tpl"Max Kostikov2018-08-251-1/+1
| |/ / /
| * | | Update wiki.tplMax Kostikov2018-08-251-1/+1
| * | | Update Wiki_page_history.phpMax Kostikov2018-08-251-3/+3
| * | | Update Wiki.phpMax Kostikov2018-08-251-2/+2
| * | | Update NativeWikiPage.phpMax Kostikov2018-08-251-4/+4
| * | | Update Wiki_page_history.phpMax Kostikov2018-08-251-1/+4
| * | | Update Wiki.phpMax Kostikov2018-08-251-0/+2
| * | | Update NativeWikiPage.phpMax Kostikov2018-08-251-2/+5
| * | | Update nwiki_page_history.tplMax Kostikov2018-08-251-7/+7
| * | | Update wiki.tplMax Kostikov2018-08-251-428/+428
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-08-270-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Revert "Change main router request variable from 'q' to 'req'. This is necess...zotlabs2018-08-2611-19/+19
| * | Change main router request variable from 'q' to 'req'. This is necessary to i...zotlabs2018-08-2611-19/+19
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 09:34:13 +0000