aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-121-14/+18
|\
| * remove logger linesAndrew Manning2017-02-111-1/+0
| * Webpage import tool works again after setting iconfig properly and following ...Andrew Manning2017-02-111-14/+19
* | testing and bug fixes virtual profile groupszotlabs2017-02-122-2/+12
* | Create virtual privacy groups for private profile member listszotlabs2017-02-124-42/+153
|/
* more work on permcats and consolidating calls that try to discover connect pe...zotlabs2017-02-094-104/+157
* bringer - all basic functionality is implementedzotlabs2017-02-082-0/+17
* fix immediate issue with multiple login forms until I can figure out an elega...zotlabs2017-02-081-1/+1
* sort the appsMario Vavti2017-02-071-0/+2
* default to manual conversation updatesMario Vavti2017-02-071-1/+3
* bring back view links for all notification types (esp: network, channel) for ...zotlabs2017-02-061-3/+5
* move icon stuff back to app_render() and send navapps through app_render()Mario Vavti2017-02-061-4/+3
* import system apps on initial loadMario Vavti2017-02-061-1/+5
* merge devMario Vavti2017-02-062-12/+57
|\
| * remove per-page login css (home, login); add support for alternative markdown...zotlabs2017-02-051-1/+36
| * more work on nav-modalzotlabs2017-02-031-11/+21
* | check for app-icons in app_list() instead of app_render()Mario Vavti2017-02-031-1/+0
* | Merge branch 'dev' into wip-app-binMario Vavti2017-02-033-5/+31
|\|
| * rename bb2diaspora.php to markdown.phpzotlabs2017-02-022-2/+2
| * move opensearch to pluginszotlabs2017-02-021-3/+29
* | remove apps from usermenuMario Vavti2017-02-021-14/+14
* | resolve merge conflictMario Vavti2017-02-021-1/+1
|\|
| * fix a few style issues with nav login panelzotlabs2017-02-011-1/+1
* | remove experimental_app_bin config conditionalMario Vavti2017-02-011-19/+17
|/
* superfluous whitespace cleanupzotlabs2017-01-312-351/+358
* move diaspora account import to the diaspora pluginzotlabs2017-01-311-148/+0
* channel export - use a selected list of functional data categories to export;...zotlabs2017-01-313-164/+234
* hide featured app category in the app category widgetMario Vavti2017-01-312-1/+2
* fix typosMario Vavti2017-01-311-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-301-3/+10
|\
| * Merge pull request #662 from anaqreon/affinity-settingszotlabs2017-01-301-3/+10
| |\
| | * Remove unrelated chatroom panel stuff that was included accidentallyAndrew Manning2017-01-291-69/+0
| | * Merge remote-tracking branch 'upstream/dev' into affinity-settingsAndrew Manning2017-01-298-193/+274
| | |\
| | * | Add affinity slider tool settings for min and max defaults in settings/featuredAndrew Manning2017-01-291-3/+79
* | | | consolidate hubloc storagezotlabs2017-01-3011-62/+97
|/ / /
* | / queue optimisations for sites that have lingered in the queue for more than a...zotlabs2017-01-291-1/+16
| |/ |/|
* | finish remaining places where xchan_store_lowlevel needs to be usedzotlabs2017-01-291-12/+0
* | Alter the queue so that each queue item stores the scheduled time of the next...zotlabs2017-01-291-4/+42
* | provide lowlevel xchan storage function to ensure that all non-null rows are ...zotlabs2017-01-287-180/+235
|/
* more work on app-binMario Vavti2017-01-271-2/+3
* better handling of html special chars in wiki and wikipage nameszotlabs2017-01-261-5/+5
* haystack/needle mixupMario Vavti2017-01-261-1/+1
* resolve the linked item delete issue by declaring what types of linked items ...zotlabs2017-01-251-1/+6
* only allow wiki owner to delete pageszotlabs2017-01-252-2/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-251-2/+5
|\
| * fixes for wiki create/delete pageMario Vavti2017-01-251-2/+5
* | initialise item['postopts'] for mysql >= 5.7zotlabs2017-01-251-0/+1
|/
* minorzotlabs2017-01-241-3/+3
* block well-known from oembedzotlabs2017-01-241-0/+3
* put login form into the nav bar. Proof of concept - needs a bit of UI tweaks.zotlabs2017-01-232-0/+16