aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev'zotlabs2018-09-1641-580/+371
|\
| * appification of the lang moduleMario Vavti2018-09-161-2/+17
| * appify pokeMario Vavti2018-09-151-2/+19
| * appify moodMario Vavti2018-09-152-3/+24
| * appify inviteMario Vavti2018-09-152-5/+19
| * appify cdav stuff. WARNING: if you use caldav or carddav from a client or the...Mario Vavti2018-09-151-5/+47
| * Merge branch 'patch-2' into 'dev'Mario2018-09-141-1/+1
| |\
| | * php2po.php unify quote/unquoteMax Kostikov2018-09-131-1/+1
| |/
| * css issuesMario Vavti2018-09-134-4/+4
| * add activity_filter and activity_order .bb filesMario Vavti2018-09-132-0/+2
| * remove network_tabs() which has been deprecated and replaced by activity_{ord...Mario Vavti2018-09-136-127/+12
| * move chat from feature to appsMario Vavti2018-09-136-47/+46
| * remove profile_tabs() which has been deprecated and replaced by channel_apps()Mario Vavti2018-09-1312-219/+5
| * Merge branch 'patch-1' into 'dev'Mario2018-09-121-1/+1
| |\
| | * Update network.phpMax Kostikov2018-09-101-1/+1
| * | more feature to app transitionMario Vavti2018-09-124-36/+32
| * | Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in EntityMario Vavti2018-09-121-0/+2
| * | mpre feature to app transitionMario Vavti2018-09-126-127/+137
| * | include item.title in /network and /channel searchMario Vavti2018-09-112-2/+4
| |/
* | do not sync the channel_moved fieldzotlabs2018-09-162-8/+9
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-09-10441-527/+52884
|\|
| * move cards from features to appsMario Vavti2018-09-104-34/+33
| * cover photo: mior issue and more cleanupMario Vavti2018-09-101-5/+3
| * cover photo: some code cleanup and fix height issue when photo was not cachedMario Vavti2018-09-101-30/+39
| * fix some issues with latest notification improvementsMario Vavti2018-09-092-4/+7
| * 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
| * 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
| |\
| * | 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
* | | important hyperdrive componentzotlabs2018-09-095-3/+80
| |/ |/|
* | 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
| |\