aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* missing textMario Vavti2018-09-071-1/+1
|
* provide a noscript_content switch for mod channel and displayMario Vavti2018-09-072-7/+22
|
* install bootstrap via composerMario Vavti2018-09-07427-426/+52769
|
* apps: change page title to available/installed, display install action label ↵Mario Vavti2018-09-073-4/+5
| | | | in button and use different icons for installable and updateable apps
* overflow should be auto not visibleMario Vavti2018-09-071-1/+1
|
* -1 has issues in some browsersMario Vavti2018-09-061-1/+1
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-061-16/+40
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-0511-41/+68
| |\
| * | detect and automatically repair duplicate plugin hook scenarios.zotlabs2018-09-051-16/+40
| | |
* | | bump versionMario Vavti2018-09-061-1/+1
| | |
* | | improve cover-photo handlingMario Vavti2018-09-061-2/+1
| | |
* | | improve notification handling on small screensMario Vavti2018-09-061-2/+6
| | |
* | | sticky-kit: improve handlingMario Vavti2018-09-062-18/+4
| |/ |/|
* | 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 ↵Mario Vavti2018-09-052-12/+2
| | | | | | | | | | | | footer." This reverts commit 1d7d604016e6728725c4b857cec85c3d5a050268.
* | Revert "Fix jumpy sidebars"Mario Vavti2018-09-051-3/+0
| | | | | | | | This reverts commit 79eb6d39423c47c8c7809ed34cdc88effbb6e97e.
* | 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 authored… See merge request hubzilla/core!1269
| | * | Corrected resubmit of fixes to Authors unable to comment on posts they ↵M.Dent2018-09-042-12/+29
| | | | | | | | | | | | | | | | authored when owned by others.
* | | | 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 ↵Mario Vavti2018-09-032-22/+7
| | | | | | | | | | | | | | | | | | | | | | | | owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions.
* | | instead of not displaying the cover-photo at all after first page load, load ↵Mario Vavti2018-09-053-8/+29
|/ / | | | | | | the page with the cover slided up. change pointer to n-resize if cover is not slid.
* | 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 others… See merge request hubzilla/core!1268
| * | Fix: Authors unable to comment on posts they authored when under owned by ↵M.Dent2018-09-012-7/+22
| | | | | | | | | | | | others in certain circumstances.
* | | 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
| |/ |/|
* | Merge branch 'call-hooks-optimization' into 'dev'Mario2018-08-301-1/+1
|\ \ | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267
| * | 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 hook See merge request hubzilla/core!1266
| * | Add dreport_process hookM.Dent2018-08-291-0/+1
| |/
* | html-to-markdown adds a backslash infront of a hash after each new line - ↵Mario Vavti2018-08-291-1/+4
| | | | | | | | manualy remove those
* | db update to get rid of bogus activitypub xchans which got created due to a ↵Mario Vavti2018-08-292-1/+27
|/ | | | bug in the pubcrawl addon
* 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
| | | | | | | | or another fix for the underlying problem is found
* | Merge branch 'extend-convitems-dropdown' into 'dev'Mario2018-08-273-2/+11
|\ \ | | | | | | | | | | | | Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Add translation to missed strings in Wiki See merge request hubzilla/core!1264
| * | | Update wiki.tplMax Kostikov2018-08-251-2/+2
| | | |
| * | | Merge branch 'revert-c16fda1c' into 'dev'Max Kostikov2018-08-251-428/+428
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!2
| | * | | Revert "Update wiki.tpl"Max Kostikov2018-08-251-428/+428
| |/ / / | | | | | | | | This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98
| * | | Merge branch 'revert-ff1a0d21' into 'dev'Max Kostikov2018-08-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!1
| | * | | Revert "Update wiki.tpl"Max Kostikov2018-08-251-1/+1
| |/ / / | | | | | | | | This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5
| * | | Update wiki.tplMax Kostikov2018-08-251-1/+1
| | | |