Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-09-06 | 1 | -16/+40 |
|\ | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-09-05 | 11 | -41/+68 |
| |\ | |||||
| * | | detect and automatically repair duplicate plugin hook scenarios. | zotlabs | 2018-09-05 | 1 | -16/+40 |
| | | | |||||
* | | | bump version | Mario Vavti | 2018-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | improve cover-photo handling | Mario Vavti | 2018-09-06 | 1 | -2/+1 |
| | | | |||||
* | | | improve notification handling on small screens | Mario Vavti | 2018-09-06 | 1 | -2/+6 |
| | | | |||||
* | | | sticky-kit: improve handling | Mario Vavti | 2018-09-06 | 2 | -18/+4 |
| |/ |/| | |||||
* | | move str_replace inside if clause | Mario Vavti | 2018-09-05 | 1 | -1/+1 |
| | | |||||
* | | hide cover photo by default and show it only if conditions are met | Mario Vavti | 2018-09-05 | 2 | -2/+4 |
| | | |||||
* | | revert "Add bottom margin on aside elements and main to allow for viewport ↵ | Mario Vavti | 2018-09-05 | 2 | -12/+2 |
| | | | | | | | | | | | | footer." This reverts commit 1d7d604016e6728725c4b857cec85c3d5a050268. | ||||
* | | Revert "Fix jumpy sidebars" | Mario Vavti | 2018-09-05 | 1 | -3/+0 |
| | | | | | | | | This reverts commit 79eb6d39423c47c8c7809ed34cdc88effbb6e97e. | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-05 | 2 | -12/+29 |
|\ \ | |||||
| * \ | Merge branch 'fix-authorcomment-fix' into 'dev' | Mario | 2018-09-05 | 2 | -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.Dent | 2018-09-04 | 2 | -12/+29 |
| | | | | | | | | | | | | | | | | authored when owned by others. | ||||
* | | | | bump version | Mario Vavti | 2018-09-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-05 | 2 | -22/+7 |
|\| | | |||||
| * | | Revert "Fix: Authors unable to comment on posts they authored when under ↵ | Mario Vavti | 2018-09-03 | 2 | -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 Vavti | 2018-09-05 | 3 | -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' | Mario | 2018-09-02 | 2 | -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.Dent | 2018-09-01 | 2 | -7/+22 |
| | | | | | | | | | | | | others in certain circumstances. | ||||
* | | | fix undefined constant warning | Mario Vavti | 2018-09-01 | 1 | -1/+1 |
| | | | |||||
* | | | do not count sys channel in totals | Mario Vavti | 2018-09-01 | 1 | -1/+1 |
| | | | |||||
* | | | update 1218: missing default value for pg | Mario Vavti | 2018-08-31 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge branch 'call-hooks-optimization' into 'dev' | Mario | 2018-08-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267 | ||||
| * | | Micro-optimization to call_hooks() | M.Dent | 2018-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'add-delivery-status-info' into 'dev' | Mario | 2018-08-30 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Add dreport_process hook See merge request hubzilla/core!1266 | ||||
| * | | Add dreport_process hook | M.Dent | 2018-08-29 | 1 | -0/+1 |
| |/ | |||||
* | | html-to-markdown adds a backslash infront of a hash after each new line - ↵ | Mario Vavti | 2018-08-29 | 1 | -1/+4 |
| | | | | | | | | manualy remove those | ||||
* | | db update to get rid of bogus activitypub xchans which got created due to a ↵ | Mario Vavti | 2018-08-29 | 2 | -1/+27 |
|/ | | | | bug in the pubcrawl addon | ||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-29 | 2 | -1/+3 |
|\ | |||||
| * | redirect stdout/stderr on cron command | zotlabs | 2018-08-28 | 2 | -1/+3 |
| | | |||||
* | | add paragonie and symfonie since ramsey/uuid appears to require them | Mario Vavti | 2018-08-28 | 14 | -0/+512 |
| | | |||||
* | | update composer libs and add ramsey/uuid | Mario Vavti | 2018-08-28 | 96 | -1241/+6276 |
| | | |||||
* | | remove distinct from network query again until performance issue is resolved ↵ | Mario Vavti | 2018-08-27 | 1 | -2/+2 |
| | | | | | | | | or another fix for the underlying problem is found | ||||
* | | Merge branch 'extend-convitems-dropdown' into 'dev' | Mario | 2018-08-27 | 3 | -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 menu | M.Dent | 2018-08-26 | 2 | -0/+9 |
| | | | |||||
| * | | Get full page of items | M.Dent | 2018-08-23 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2018-08-27 | 5 | -11/+19 |
|\ \ \ | | | | | | | | | | | | | | | | | Add translation to missed strings in Wiki See merge request hubzilla/core!1264 | ||||
| * | | | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'revert-c16fda1c' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!2 | ||||
| | * | | | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -428/+428 |
| |/ / / | | | | | | | | | This reverts commit c16fda1cb6fef84788d3045b0edff367d2978c98 | ||||
| * | | | Merge branch 'revert-ff1a0d21' into 'dev' | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Update wiki.tpl" See merge request Kostikov/core!1 | ||||
| | * | | | Revert "Update wiki.tpl" | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| |/ / / | | | | | | | | | This reverts commit ff1a0d217ff769a2e6e622915cb7e9d9eff327b5 | ||||
| * | | | Update wiki.tpl | Max Kostikov | 2018-08-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -4/+4 |
| | | | | |||||
| * | | | Update Wiki_page_history.php | Max Kostikov | 2018-08-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | Update Wiki.php | Max Kostikov | 2018-08-25 | 1 | -0/+2 |
| | | | | |||||
| * | | | Update NativeWikiPage.php | Max Kostikov | 2018-08-25 | 1 | -2/+5 |
| | | | |